Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use __stdcall for libspotify callbacks on windows, call the right executable

Browse Source
This commit is contained in:
David Sansome 2011-04-30 18:22:14 +00:00
parent d41916cf79
commit e6032a7c51
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spotifyblob/blob/CMakeLists.txt
View File

@ -22,9 +22,14 @@ set(HEADERS
qt4_wrap_cpp(MOC ${HEADERS})
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
set(win32_build_flag WIN32)
endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
add_executable(clementine-spotifyblob
${SOURCES}
${MOC}
${win32_build_flag}
)
target_link_libraries(clementine-spotifyblob

30
spotifyblob/blob/spotifyclient.h
View File

@ -56,39 +56,39 @@ private:
void SendPlaybackError(const QString& error);
// Spotify session callbacks.
static void LoggedInCallback(sp_session* session, sp_error error);
static void NotifyMainThreadCallback(sp_session* session);
static void LogMessageCallback(sp_session* session, const char* data);
static void SearchCompleteCallback(sp_search* result, void* userdata);
static void MetadataUpdatedCallback(sp_session* session);
static int MusicDeliveryCallback(
static void SP_CALLCONV LoggedInCallback(sp_session* session, sp_error error);
static void SP_CALLCONV NotifyMainThreadCallback(sp_session* session);
static void SP_CALLCONV LogMessageCallback(sp_session* session, const char* data);
static void SP_CALLCONV SearchCompleteCallback(sp_search* result, void* userdata);
static void SP_CALLCONV MetadataUpdatedCallback(sp_session* session);
static int SP_CALLCONV MusicDeliveryCallback(
sp_session* session, const sp_audioformat* format,
const void* frames, int num_frames);
static void EndOfTrackCallback(sp_session* session);
static void StreamingErrorCallback(sp_session* session, sp_error error);
static void SP_CALLCONV EndOfTrackCallback(sp_session* session);
static void SP_CALLCONV StreamingErrorCallback(sp_session* session, sp_error error);
// Spotify playlist container callbacks.
static void PlaylistAddedCallback(
static void SP_CALLCONV PlaylistAddedCallback(
sp_playlistcontainer* pc, sp_playlist* playlist,
int position, void* userdata);
static void PlaylistRemovedCallback(
static void SP_CALLCONV PlaylistRemovedCallback(
sp_playlistcontainer* pc, sp_playlist* playlist,
int position, void* userdata);
static void PlaylistMovedCallback(
static void SP_CALLCONV PlaylistMovedCallback(
sp_playlistcontainer* pc, sp_playlist* playlist,
int position, int new_position, void* userdata);
static void PlaylistContainerLoadedCallback(
static void SP_CALLCONV PlaylistContainerLoadedCallback(
sp_playlistcontainer* pc, void* userdata);
// Spotify playlist callbacks - when loading the list of playlists
// initially
static void PlaylistStateChangedForGetPlaylists(sp_playlist* pl, void* userdata);
static void SP_CALLCONV PlaylistStateChangedForGetPlaylists(sp_playlist* pl, void* userdata);
// Spotify playlist callbacks - when loading a playlist
static void PlaylistStateChangedForLoadPlaylist(sp_playlist* pl, void* userdata);
static void SP_CALLCONV PlaylistStateChangedForLoadPlaylist(sp_playlist* pl, void* userdata);
// Spotify image callbacks.
static void ImageLoaded(sp_image* image, void* userdata);
static void SP_CALLCONV ImageLoaded(sp_image* image, void* userdata);
// Request handlers.
void Login(const QString& username, const QString& password);

4
src/radio/spotifyservice.cpp
View File

@ -51,8 +51,8 @@ SpotifyService::SpotifyService(RadioModel* parent)
system_blob_path_ = QCoreApplication::applicationDirPath() +
"/../PlugIns/clementine-spotifyblob";
#else
system_blob_path_ = QCoreApplication::applicationFilePath() +
"-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
system_blob_path_ = QCoreApplication::applicationDirPath() +
"/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
#endif
local_blob_version_ = QString("version%1-%2bit").arg(SPOTIFY_BLOB_VERSION).arg(sizeof(void*) * 8);