akezeke / spotyxbmc2

spotyXBMC is a fork of XBMC with spotify support
Other
133 stars 29 forks source link

Files mentioned in readme moved #28

Closed chrstnwhlrt closed 12 years ago

chrstnwhlrt commented 12 years ago

There are some changes in the dir structure, not yet mentioned in the readme:

please correct this in the readme, I'am merging your code with the xbmc-pvr right now..

regards

OK code merged successfully... corrected list:

Added files:

xbmc/music/spotyXBMC/ addons/plugin.music.spotyXBMC/ addons/skin.confluence/media/flagging/audio/spotify.png

Modified files:

xbmc/cores/paplayer/CodecFactory.cpp xbmc/filesystem/MusicSearchDirectory.cpp xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp xbmc/music/windows/GUIWindowMusicBase.cpp xbmc/music/windows/GUIWindowMusicNav.cpp xbmc/dialogs/GUIDialogContextMenu.h xbmc/music/Makefile xbmc/settings/Settings.cpp xbmc/settings/AdvancedSettings.h xbmc/settings/AdvancedSettings.cpp xbmc/Application.h xbmc/Application.cpp xbmc/GUIInfoManager.cpp configure.in

akezeke commented 12 years ago

Thanks!

chrstnwhlrt commented 12 years ago

I'm not sure, but some of the files only differ to the pvr branch in a member called something like "..servermode..", this doesn't seem to be necessary to merge, as I recognized yesterday..