Fixed Linux compile... but getting an "Invalid API Key" error.

This commit is contained in:
casey langen 2018-05-02 22:07:41 -07:00
parent c31514c315
commit d2ab0a84f2
8 changed files with 13 additions and 16 deletions

View File

@ -55,9 +55,9 @@ link_directories (
${musikcube_SOURCE_DIR}/src/plugins/taglib_plugin/taglib-1.11/stage/lib)
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set (musikcube_LINK_LIBS ${BOOST_LINK_LIBS} curl pthread)
set (musikcube_LINK_LIBS ${BOOST_LINK_LIBS} curl pthread crypto)
else()
set (musikcube_LINK_LIBS ${BOOST_LINK_LIBS} dl curl pthread)
set (musikcube_LINK_LIBS ${BOOST_LINK_LIBS} dl curl pthread crypto)
endif()
include_directories (

View File

@ -365,8 +365,4 @@ namespace musik { namespace core { namespace io {
}
}
template <typename T>
const T& Stream() {
return this->ostream;
}
} } }
} } }

View File

@ -310,10 +310,10 @@ namespace musik { namespace core {
#ifdef WIN32
ShellExecuteA(nullptr, nullptr, path.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
#elif __APPLE__
string command = "open " + path;
std::string command = "open " + path;
system(command.c_str());
#else
string command = "xdg-open " + path;
std::string command = "xdg-open " + path;
system(command.c_str());
#endif
}

View File

@ -13,6 +13,7 @@ set (CUBE_SRCS
./app/model/DirectoryAdapter.cpp
./app/overlay/BrowseOverlays.cpp
./app/overlay/ColorThemeOverlay.cpp
./app/overlay/LastFmOverlay.cpp
./app/overlay/LocaleOverlay.cpp
./app/overlay/PlaybackOverlays.cpp
./app/overlay/PlayQueueOverlays.cpp
@ -20,8 +21,9 @@ set (CUBE_SRCS
./app/overlay/PreampOverlay.cpp
./app/overlay/ServerOverlay.cpp
./app/overlay/VisualizerOverlay.cpp
./app/util/Hotkeys.cpp
./app/util/GlobalHotkeys.cpp
./app/util/Hotkeys.cpp
./app/util/LastFm.cpp
./app/util/PreferenceKeys.cpp
./app/util/Playback.cpp
./app/util/UpdateCheck.cpp

View File

@ -256,7 +256,7 @@ void SettingsLayout::OnTransportDropdownActivate(cursespp::TextLabel* label) {
}
void SettingsLayout::OnLastFmDropdownActivate(cursespp::TextLabel* label) {
LastFmOverlay::Show();
LastFmOverlay::Start();
}
void SettingsLayout::OnPluginsDropdownActivate(cursespp::TextLabel* label) {

View File

@ -55,7 +55,7 @@ static std::map<LastFmOverlay::State, std::string> stateToText = {
{ LastFmOverlay::State::RegisterError, "settings_last_fm_dialog_message_register_error" }
};
void LastFmOverlay::Show() {
void LastFmOverlay::Start() {
std::shared_ptr<LastFmOverlay> overlay(new LastFmOverlay());
App::Overlays().Push(overlay);
}

View File

@ -56,7 +56,8 @@ namespace musik { namespace cube {
RegisterError = 6
};
static void Show();
static void Start();
virtual ~LastFmOverlay();
virtual void ProcessMessage(musik::core::runtime::IMessage &message);

View File

@ -32,8 +32,6 @@
//
//////////////////////////////////////////////////////////////////////////////
#pragma once
#include "stdafx.h"
#include "LastFm.h"
#include <curl/curl.h>
@ -233,4 +231,4 @@ namespace musik { namespace cube { namespace lastfm {
}
}
} } }
} } }