From 1eb76885b36989a62737cdfb35a20954feb5b6b9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 16 Dec 2014 12:21:41 +0100 Subject: Revert "change xbmc/ path to src/ in all files" This reverts commit 4949be256667f3e500e52b7084476ae1f2b00d92. --- .gitignore | 416 +- Kodi.xcodeproj/project.pbxproj | 130 +- Makefile.in | 328 +- Makefile.include.in | 8 +- bootstrap.mk | 4 +- codegenerator.mk | 6 +- configure.in | 116 +- language/English/strings.po | 1920 +++++----- lib/addons/library.xbmc.addon/Makefile.in | 6 +- lib/addons/library.xbmc.addon/libXBMC_addon.cpp | 4 +- .../project/VS2010Express/libXBMC_addon.vcxproj | 4 +- lib/addons/library.xbmc.codec/Makefile.in | 6 +- .../project/VS2010Express/libXBMC_codec.vcxproj | 4 +- lib/addons/library.xbmc.gui/Makefile.in | 6 +- .../project/VS2010Express/libXBMC_gui.vcxproj | 4 +- lib/addons/library.xbmc.pvr/Makefile.in | 6 +- .../project/VS2010Express/libXBMC_pvr.vcxproj | 4 +- lib/asap/Makefile.in | 12 +- lib/cmyth/Win32/libcmyth.vcxproj | 4 +- lib/libdvd/Makefile.in | 4 +- lib/libexif/Makefile.in | 6 +- lib/libhdhomerun/Makefile.in | 8 +- lib/libsidplay2/Makefile.in | 15 +- lib/nosefart/Makefile.in | 6 +- lib/snesapu/SNES/SNESAPU/Makefile.in | 6 +- lib/stsound/StSoundLibrary/Makefile.in | 6 +- lib/timidity/Makefile.in | 8 +- lib/vgmstream/Makefile.in | 6 +- project/VS2010Express/UnrarXLib.vcxproj | 6 +- project/VS2010Express/XBMC for Windows.sln | 8 +- project/VS2010Express/XBMC.vcxproj | 3986 ++++++++++---------- project/VS2010Express/XBMC.vcxproj.filters | 3908 +++++++++---------- project/VS2010Express/XbmcCommons.vcxproj | 16 +- project/VS2010Express/XbmcCommons.vcxproj.filters | 12 +- project/VS2010Express/XbmcThreads.vcxproj | 72 +- project/VS2010Express/XbmcThreads.vcxproj.filters | 68 +- project/VS2010Express/test-XbmcThreads.vcxproj | 20 +- .../VS2010Express/test-XbmcThreads.vcxproj.filters | 14 +- project/cmake/scripts/common/prepare-env.cmake | 4 +- src/ApplicationMessenger.cpp | 2 +- src/addons/addon-bindings.mk | 30 +- src/cores/AudioEngine/Makefile.in | 14 +- src/cores/VideoRenderers/LinuxRendererGLES.cpp | 2 +- src/cores/VideoRenderers/LinuxRendererGLES.h | 6 +- src/cores/VideoRenderers/MMALRenderer.cpp | 2 +- src/cores/VideoRenderers/RenderCapture.h | 2 +- src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in | 2 +- src/cores/dvdplayer/DVDCodecs/Makefile.in | 2 +- src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in | 2 +- src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h | 2 +- src/cores/dvdplayer/DVDCodecs/Video/Makefile.in | 2 +- .../Video/libstagefrightICS/StageFrightVideo.cpp | 2 +- .../libstagefrightICS/StageFrightVideoPrivate.h | 2 +- src/cores/dvdplayer/DVDDemuxers/Makefile.in | 2 +- .../DVDInputStreams/DVDInputStreamFFmpeg.cpp | 2 +- src/cores/dvdplayer/DVDPlayer.cpp | 4 +- src/cores/dvdplayer/DVDSubtitles/Makefile.in | 2 +- src/cores/omxplayer/OMXPlayerAudio.h | 2 +- src/cores/omxplayer/OMXVideo.cpp | 2 +- src/cores/omxplayer/OMXVideo.h | 4 +- src/filesystem/AndroidAppDirectory.cpp | 2 +- src/guilib/GUIStaticItem.h | 2 +- src/interfaces/python/Makefile.in | 2 +- src/linux/OMXCore.cpp | 2 +- src/network/upnp/UPnPServer.cpp | 2 +- src/osx/IOSEAGLView.mm | 4 +- src/osx/IOSScreenManager.mm | 4 +- src/osx/Makefile.in | 4 +- src/pvr/channels/PVRChannel.h | 2 +- src/rendering/gles/RenderSystemGLES.h | 2 +- src/utils/Screenshot.cpp | 2 +- src/visualizations/Goom/Makefile.in | 4 +- src/visualizations/OpenGLSpectrum/Makefile.in | 4 +- src/visualizations/WaveForm/Makefile.in | 4 +- src/visualizations/WaveForm/Waveform.vcxproj | 4 +- src/visualizations/XBMCProjectM/Makefile.in | 6 +- src/windowing/WinEventsWayland.cpp | 2 +- src/windowing/X11/XRandR.cpp | 2 +- src/windows/GUIMediaWindow.cpp | 2 +- tools/TexturePacker/Makefile.in | 8 +- tools/TexturePacker/Win32/MakeDDS.vcxproj | 14 +- tools/TexturePacker/Win32/MakeDDS.vcxproj.filters | 4 +- tools/TexturePacker/Win32/TexturePacker.vcxproj | 8 +- .../Win32/TexturePacker.vcxproj.filters | 4 +- tools/codegenerator/GenerateSWIGBindings.bat | 4 +- tools/darwin/Configurations/App.xcconfig.in | 4 +- tools/darwin/Support/CopyRootFiles-atv2.command | 2 +- tools/darwin/Support/CopyRootFiles-ios.command | 2 +- tools/darwin/Support/CopyRootFiles-osx.command | 2 +- tools/darwin/Support/copyframeworks-atv2.command | 4 +- tools/darwin/Support/copyframeworks-ios.command | 4 +- tools/darwin/Support/copyframeworks-osx.command | 6 +- tools/darwin/Support/makepythoninterface.command | 2 +- tools/windows/CompileInfo.bat | 4 +- tools/windows/JsonSchemaBuilder.bat | 2 +- 95 files changed, 5691 insertions(+), 5696 deletions(-) diff --git a/.gitignore b/.gitignore index b5a0f82995..912434e8e4 100644 --- a/.gitignore +++ b/.gitignore @@ -509,215 +509,215 @@ lib/cpluff/stamp-h1 /userdata/cache /userdata/guisettings.xml -# /src/ -/src/.GitRevision -/src/config.h -/src/config.h.in -/src/config.h.in~ -/src/CompileInfo.cpp -/src/DllPaths_generated.h -/src/DllPaths_generated_android.h -/src/Makefile -/src/stamp-h1 - -# /src/addons/ -/src/addons/Makefile -/src/addons/visualization.waveform - -# /src/android -/src/android/Makefile -/src/android/activity/Makefile -/src/android/loader/Makefile -/src/android/jni/Makefile - -# /src/cdrip/ -/src/cdrip/Makefile - -# /src/cores/ -/src/cores/AudioEngine/Makefile -/src/cores/DllLoader/exports/build_wrapper.sh -/src/cores/DllLoader/exports/wrapper.def -/src/cores/DllLoader/Makefile -/src/cores/DllLoader/exports/Makefile -/src/cores/dvdplayer/Makefile -/src/cores/dvdplayer/DVDCodecs/Audio/Makefile -/src/cores/dvdplayer/DVDCodecs/Makefile -/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile -/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile -/src/cores/dvdplayer/DVDCodecs/Video/Makefile -/src/cores/dvdplayer/DVDDemuxers/Makefile -/src/cores/dvdplayer/DVDSubtitles/Makefile -/src/cores/omxplayer/Makefile -/src/cores/paplayer/Makefile -/src/cores/playercorefactory/Makefile -/src/cores/Makefile -/src/cores/VideoRenderers/Makefile - -# /src/filesystem/ -/src/filesystem/Makefile - -# /src/freebsd/ -/src/freebsd/Makefile - -# /src/guilib/ -/src/guilib/Makefile -/src/guilib/*.obj -/src/guilib/*.idb -/src/guilib/*.pdb -/src/guilib/*.bak -/src/guilib/Debug (Win32) -/src/guilib/Release (Win32) -/src/guilib/Release -/src/guilib/Release_LTCG -/src/guilib/Debug -/src/guilib/Profile -/src/guilib/Profile_FastCap - -# /src/input -/src/input/linux/Makefile - -# /src/interfaces/ -/src/interfaces/Makefile -/src/interfaces/json-rpc/ServiceDescription.h -/src/interfaces/python/Makefile -/src/interfaces/python/generated/ -/src/interfaces/python/test/Makefile - -# /src/linux/ -/src/linux/Makefile -/src/linux/sse4/Makefile - -# /src/main/ -/src/main/Makefile - -# /src/music/ -/src/music/karaoke/Makefile - -# /src/network/ -/src/network/Makefile -/src/network/upnp/Makefile - -# /src/osx/ -/src/osx/Makefile -/src/osx/Info.plist -/src/osx/ios/XBMCIOS-Info.plist -/src/osx/atv2/XBMCATV2-Info.plist - -# /src/peripherals/ -/src/peripherals/bus/Makefile -/src/peripherals/devices/Makefile - -#/src/screensavers/ -/src/screensavers/Makefile -/src/screensavers/rsxs-0.9/Makefile -/src/screensavers/rsxs-0.9/configure -/src/screensavers/rsxs-0.9/config.h -/src/screensavers/rsxs-0.9/config.log -/src/screensavers/rsxs-0.9/config/Makefile -/src/screensavers/rsxs-0.9/lib/Makefile -/src/screensavers/rsxs-0.9/libltdl/Makefile -/src/screensavers/rsxs-0.9/src/Makefile -/src/screensavers/rsxs-0.9/src/cyclone/Makefile -/src/screensavers/rsxs-0.9/src/euphoria/Makefile -/src/screensavers/rsxs-0.9/src/fieldlines/Makefile -/src/screensavers/rsxs-0.9/src/flocks/Makefile -/src/screensavers/rsxs-0.9/src/flux/Makefile -/src/screensavers/rsxs-0.9/src/helios/Makefile -/src/screensavers/rsxs-0.9/src/hyperspace/Makefile -/src/screensavers/rsxs-0.9/src/lattice/Makefile -/src/screensavers/rsxs-0.9/src/plasma/Makefile -/src/screensavers/rsxs-0.9/src/skyrocket/Makefile -/src/screensavers/rsxs-0.9/src/solarwinds/Makefile -/src/screensavers/rsxs-0.9/xbmc/Makefile -/src/screensavers/rsxs-0.9/autom4te.cache/ -/src/screensavers/rsxs-0.9/lib/alloca.h -/src/screensavers/rsxs-0.9/lib/argz.h -/src/screensavers/rsxs-0.9/lib/getopt.h -/src/screensavers/rsxs-0.9/rsxs.spec -/src/screensavers/rsxs-0.9/src/.dirstamp -/src/screensavers/rsxs-0.9/src/euphoria/rs-euphoria -/src/screensavers/rsxs-0.9/src/plasma/rs-plasma -/src/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds -/src/screensavers/rsxs-0.9/stamp-h1 -/src/screensavers/rsxs-0.9/aclocal.m4 -/src/screensavers/rsxs-0.9/compile -/src/screensavers/rsxs-0.9/config.guess -/src/screensavers/rsxs-0.9/config.h.in -/src/screensavers/rsxs-0.9/config.h.in~ -/src/screensavers/rsxs-0.9/config.sub -/src/screensavers/rsxs-0.9/config/Makefile.in -/src/screensavers/rsxs-0.9/depcomp -/src/screensavers/rsxs-0.9/INSTALL -/src/screensavers/rsxs-0.9/install-sh -/src/screensavers/rsxs-0.9/lib/Makefile.in -/src/screensavers/rsxs-0.9/libltdl/Makefile.in -/src/screensavers/rsxs-0.9/Makefile.in -/src/screensavers/rsxs-0.9/missing -/src/screensavers/rsxs-0.9/src/cyclone/Makefile.in -/src/screensavers/rsxs-0.9/src/euphoria/Makefile.in -/src/screensavers/rsxs-0.9/src/fieldlines/Makefile.in -/src/screensavers/rsxs-0.9/src/flocks/Makefile.in -/src/screensavers/rsxs-0.9/src/flux/Makefile.in -/src/screensavers/rsxs-0.9/src/helios/Makefile.in -/src/screensavers/rsxs-0.9/src/hyperspace/Makefile.in -/src/screensavers/rsxs-0.9/src/lattice/Makefile.in -/src/screensavers/rsxs-0.9/src/Makefile.in -/src/screensavers/rsxs-0.9/src/plasma/Makefile.in -/src/screensavers/rsxs-0.9/src/skyrocket/Makefile.in -/src/screensavers/rsxs-0.9/src/solarwinds/Makefile.in - -#/src/utils -/src/utils/Makefile - -#/src/visualizations/ -/src/visualizations/DirectXSpectrum/Debug (DirectX) -/src/visualizations/DirectXSpectrum/Release (DirectX) -/src/visualizations/EGLHelpers/Makefile -/src/visualizations/fishBMC/Makefile -/src/visualizations/Goom/Makefile -/src/visualizations/Goom/goom2k4-0/aclocal.m4 -/src/visualizations/Goom/goom2k4-0/compile -/src/visualizations/Goom/goom2k4-0/configure -/src/visualizations/Goom/goom2k4-0/INSTALL -/src/visualizations/Goom/goom2k4-0/mkinstalldirs -/src/visualizations/Goom/goom2k4-0/Makefile.in -/src/visualizations/Goom/goom2k4-0/config.guess -/src/visualizations/Goom/goom2k4-0/config.sub -/src/visualizations/Goom/goom2k4-0/depcomp -/src/visualizations/Goom/goom2k4-0/install-sh -/src/visualizations/Goom/goom2k4-0/ltmain.sh -/src/visualizations/Goom/goom2k4-0/missing -/src/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in -/src/visualizations/Goom/goom2k4-0/src/Makefile.in -/src/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in -/src/visualizations/Goom/goom2k4-0/ylwrap -/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h -/src/visualizations/Milkdrop/Debug -/src/visualizations/Milkdrop/Release -/src/visualizations/OpenGLSpectrum/Makefile -/src/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj -/src/visualizations/WaveForm/Makefile -/src/visualizations/WaveForm/Debug (DirectX) -/src/visualizations/WaveForm/Release (DirectX) -/src/visualizations/XBMCProjectM/Makefile -/src/visualizations/XBMCProjectM/libprojectM/Makefile -/src/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt -/src/visualizations/XBMCProjectM/libprojectM/CMakeFiles/ -/src/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake -/src/visualizations/XBMCProjectM/libprojectM/config.inp - -#/src/win32/ -/src/win32/XBMC_PC.rc +# /xbmc/ +/xbmc/.GitRevision +/xbmc/config.h +/xbmc/config.h.in +/xbmc/config.h.in~ +/xbmc/CompileInfo.cpp +/xbmc/DllPaths_generated.h +/xbmc/DllPaths_generated_android.h +/xbmc/Makefile +/xbmc/stamp-h1 + +# /xbmc/addons/ +/xbmc/addons/Makefile +/xbmc/addons/visualization.waveform + +# /xbmc/android +/xbmc/android/Makefile +/xbmc/android/activity/Makefile +/xbmc/android/loader/Makefile +/xbmc/android/jni/Makefile + +# /xbmc/cdrip/ +/xbmc/cdrip/Makefile + +# /xbmc/cores/ +/xbmc/cores/AudioEngine/Makefile +/xbmc/cores/DllLoader/exports/build_wrapper.sh +/xbmc/cores/DllLoader/exports/wrapper.def +/xbmc/cores/DllLoader/Makefile +/xbmc/cores/DllLoader/exports/Makefile +/xbmc/cores/dvdplayer/Makefile +/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile +/xbmc/cores/dvdplayer/DVDCodecs/Makefile +/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile +/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile +/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile +/xbmc/cores/dvdplayer/DVDDemuxers/Makefile +/xbmc/cores/dvdplayer/DVDSubtitles/Makefile +/xbmc/cores/omxplayer/Makefile +/xbmc/cores/paplayer/Makefile +/xbmc/cores/playercorefactory/Makefile +/xbmc/cores/Makefile +/xbmc/cores/VideoRenderers/Makefile + +# /xbmc/filesystem/ +/xbmc/filesystem/Makefile + +# /xbmc/freebsd/ +/xbmc/freebsd/Makefile + +# /xbmc/guilib/ +/xbmc/guilib/Makefile +/xbmc/guilib/*.obj +/xbmc/guilib/*.idb +/xbmc/guilib/*.pdb +/xbmc/guilib/*.bak +/xbmc/guilib/Debug (Win32) +/xbmc/guilib/Release (Win32) +/xbmc/guilib/Release +/xbmc/guilib/Release_LTCG +/xbmc/guilib/Debug +/xbmc/guilib/Profile +/xbmc/guilib/Profile_FastCap + +# /xbmc/input +/xbmc/input/linux/Makefile + +# /xbmc/interfaces/ +/xbmc/interfaces/Makefile +/xbmc/interfaces/json-rpc/ServiceDescription.h +/xbmc/interfaces/python/Makefile +/xbmc/interfaces/python/generated/ +/xbmc/interfaces/python/test/Makefile + +# /xbmc/linux/ +/xbmc/linux/Makefile +/xbmc/linux/sse4/Makefile + +# /xbmc/main/ +/xbmc/main/Makefile + +# /xbmc/music/ +/xbmc/music/karaoke/Makefile + +# /xbmc/network/ +/xbmc/network/Makefile +/xbmc/network/upnp/Makefile + +# /xbmc/osx/ +/xbmc/osx/Makefile +/xbmc/osx/Info.plist +/xbmc/osx/ios/XBMCIOS-Info.plist +/xbmc/osx/atv2/XBMCATV2-Info.plist + +# /xbmc/peripherals/ +/xbmc/peripherals/bus/Makefile +/xbmc/peripherals/devices/Makefile + +#/xbmc/screensavers/ +/xbmc/screensavers/Makefile +/xbmc/screensavers/rsxs-0.9/Makefile +/xbmc/screensavers/rsxs-0.9/configure +/xbmc/screensavers/rsxs-0.9/config.h +/xbmc/screensavers/rsxs-0.9/config.log +/xbmc/screensavers/rsxs-0.9/config/Makefile +/xbmc/screensavers/rsxs-0.9/lib/Makefile +/xbmc/screensavers/rsxs-0.9/libltdl/Makefile +/xbmc/screensavers/rsxs-0.9/src/Makefile +/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile +/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile +/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile +/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile +/xbmc/screensavers/rsxs-0.9/src/flux/Makefile +/xbmc/screensavers/rsxs-0.9/src/helios/Makefile +/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile +/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile +/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile +/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile +/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile +/xbmc/screensavers/rsxs-0.9/xbmc/Makefile +/xbmc/screensavers/rsxs-0.9/autom4te.cache/ +/xbmc/screensavers/rsxs-0.9/lib/alloca.h +/xbmc/screensavers/rsxs-0.9/lib/argz.h +/xbmc/screensavers/rsxs-0.9/lib/getopt.h +/xbmc/screensavers/rsxs-0.9/rsxs.spec +/xbmc/screensavers/rsxs-0.9/src/.dirstamp +/xbmc/screensavers/rsxs-0.9/src/euphoria/rs-euphoria +/xbmc/screensavers/rsxs-0.9/src/plasma/rs-plasma +/xbmc/screensavers/rsxs-0.9/src/solarwinds/rs-solarwinds +/xbmc/screensavers/rsxs-0.9/stamp-h1 +/xbmc/screensavers/rsxs-0.9/aclocal.m4 +/xbmc/screensavers/rsxs-0.9/compile +/xbmc/screensavers/rsxs-0.9/config.guess +/xbmc/screensavers/rsxs-0.9/config.h.in +/xbmc/screensavers/rsxs-0.9/config.h.in~ +/xbmc/screensavers/rsxs-0.9/config.sub +/xbmc/screensavers/rsxs-0.9/config/Makefile.in +/xbmc/screensavers/rsxs-0.9/depcomp +/xbmc/screensavers/rsxs-0.9/INSTALL +/xbmc/screensavers/rsxs-0.9/install-sh +/xbmc/screensavers/rsxs-0.9/lib/Makefile.in +/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.in +/xbmc/screensavers/rsxs-0.9/Makefile.in +/xbmc/screensavers/rsxs-0.9/missing +/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.in +/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.in + +#/xbmc/utils +/xbmc/utils/Makefile + +#/xbmc/visualizations/ +/xbmc/visualizations/DirectXSpectrum/Debug (DirectX) +/xbmc/visualizations/DirectXSpectrum/Release (DirectX) +/xbmc/visualizations/EGLHelpers/Makefile +/xbmc/visualizations/fishBMC/Makefile +/xbmc/visualizations/Goom/Makefile +/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4 +/xbmc/visualizations/Goom/goom2k4-0/compile +/xbmc/visualizations/Goom/goom2k4-0/configure +/xbmc/visualizations/Goom/goom2k4-0/INSTALL +/xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs +/xbmc/visualizations/Goom/goom2k4-0/Makefile.in +/xbmc/visualizations/Goom/goom2k4-0/config.guess +/xbmc/visualizations/Goom/goom2k4-0/config.sub +/xbmc/visualizations/Goom/goom2k4-0/depcomp +/xbmc/visualizations/Goom/goom2k4-0/install-sh +/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh +/xbmc/visualizations/Goom/goom2k4-0/missing +/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in +/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in +/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in +/xbmc/visualizations/Goom/goom2k4-0/ylwrap +/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/confdefs.h +/xbmc/visualizations/Milkdrop/Debug +/xbmc/visualizations/Milkdrop/Release +/xbmc/visualizations/OpenGLSpectrum/Makefile +/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj +/xbmc/visualizations/WaveForm/Makefile +/xbmc/visualizations/WaveForm/Debug (DirectX) +/xbmc/visualizations/WaveForm/Release (DirectX) +/xbmc/visualizations/XBMCProjectM/Makefile +/xbmc/visualizations/XBMCProjectM/libprojectM/Makefile +/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeCache.txt +/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeFiles/ +/xbmc/visualizations/XBMCProjectM/libprojectM/cmake_install.cmake +/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp + +#/xbmc/win32/ +/xbmc/win32/XBMC_PC.rc # no longer used -/src/win32/git_rev.h - -# /src/windowing/ -/src/windowing/Makefile -/src/windowing/egl/Makefile -/src/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h -/src/windowing/tests/wayland/xbmc_wayland_test_protocol.c -/src/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h -/src/windowing/tests/wayland/Makefile +/xbmc/win32/git_rev.h + +# /xbmc/windowing/ +/xbmc/windowing/Makefile +/xbmc/windowing/egl/Makefile +/xbmc/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h +/xbmc/windowing/tests/wayland/xbmc_wayland_test_protocol.c +/xbmc/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h +/xbmc/windowing/tests/wayland/Makefile # /lib/libdvd/ /lib/libdvd/Makefile diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj index 517b27fc62..6dd3cf260e 100644 --- a/Kodi.xcodeproj/project.pbxproj +++ b/Kodi.xcodeproj/project.pbxproj @@ -4178,14 +4178,14 @@ 7C779E51104A58F900F444C4 /* GUIWindowTestPatternGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowTestPatternGL.h; sourceTree = ""; }; 7C7B2B2E1134F36400713D6D /* mysqldataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mysqldataset.cpp; sourceTree = ""; }; 7C7B2B2F1134F36400713D6D /* mysqldataset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mysqldataset.h; sourceTree = ""; }; - 7C7BCDBF17727951004842FB /* IListProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IListProvider.cpp; path = src/listproviders/IListProvider.cpp; sourceTree = SOURCE_ROOT; }; - 7C7BCDC217727951004842FB /* StaticProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticProvider.h; path = src/listproviders/StaticProvider.h; sourceTree = SOURCE_ROOT; }; - 7C7BCDC317727951004842FB /* StaticProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticProvider.cpp; path = src/listproviders/StaticProvider.cpp; sourceTree = SOURCE_ROOT; }; - 7C7BCDC417727951004842FB /* IListProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IListProvider.h; path = src/listproviders/IListProvider.h; sourceTree = SOURCE_ROOT; }; + 7C7BCDBF17727951004842FB /* IListProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IListProvider.cpp; path = xbmc/listproviders/IListProvider.cpp; sourceTree = SOURCE_ROOT; }; + 7C7BCDC217727951004842FB /* StaticProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StaticProvider.h; path = xbmc/listproviders/StaticProvider.h; sourceTree = SOURCE_ROOT; }; + 7C7BCDC317727951004842FB /* StaticProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StaticProvider.cpp; path = xbmc/listproviders/StaticProvider.cpp; sourceTree = SOURCE_ROOT; }; + 7C7BCDC417727951004842FB /* IListProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IListProvider.h; path = xbmc/listproviders/IListProvider.h; sourceTree = SOURCE_ROOT; }; 7C7CEAEF165629530059C9EB /* AELimiter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AELimiter.cpp; sourceTree = ""; }; 7C7CEAF0165629530059C9EB /* AELimiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AELimiter.h; sourceTree = ""; }; - 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = src/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; }; - 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = src/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; }; + 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; }; + 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; }; 7C87B2CC162CE39600EF897D /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = ""; }; 7C87B2CD162CE39600EF897D /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = ""; }; 7C89619013B6A16F003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = ""; }; @@ -4205,8 +4205,8 @@ 7C8AE84C189DE3CD00C33786 /* CoreAudioStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CoreAudioStream.cpp; path = Sinks/osx/CoreAudioStream.cpp; sourceTree = ""; }; 7C8AE852189DE47400C33786 /* CoreAudioHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CoreAudioHelpers.cpp; path = Sinks/osx/CoreAudioHelpers.cpp; sourceTree = ""; }; 7C8AE853189DE47700C33786 /* CoreAudioHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CoreAudioHelpers.h; path = Sinks/osx/CoreAudioHelpers.h; sourceTree = ""; }; - 7C8FC6EC1829A4580045153D /* DirectoryProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryProvider.cpp; path = src/listproviders/DirectoryProvider.cpp; sourceTree = SOURCE_ROOT; }; - 7C8FC6ED1829A4580045153D /* DirectoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryProvider.h; path = src/listproviders/DirectoryProvider.h; sourceTree = SOURCE_ROOT; }; + 7C8FC6EC1829A4580045153D /* DirectoryProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryProvider.cpp; path = xbmc/listproviders/DirectoryProvider.cpp; sourceTree = SOURCE_ROOT; }; + 7C8FC6ED1829A4580045153D /* DirectoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryProvider.h; path = xbmc/listproviders/DirectoryProvider.h; sourceTree = SOURCE_ROOT; }; 7C908892196358A8003D0619 /* auto_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = auto_buffer.cpp; sourceTree = ""; }; 7C908893196358A8003D0619 /* auto_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auto_buffer.h; sourceTree = ""; }; 7C920CF7181669FF00DA1477 /* TextureOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureOperations.cpp; sourceTree = ""; }; @@ -6026,15 +6026,15 @@ F50FE04D11A3411A00C8B8CD /* EncoderFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderFFmpeg.cpp; sourceTree = ""; }; F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OSXGNUReplacements.c; sourceTree = ""; }; F51CEEF00F5C5D28004F4602 /* OSXGNUReplacements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSXGNUReplacements.h; sourceTree = ""; }; - F51CEF860F5C64A5004F4602 /* DVDInputStreamHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDInputStreamHTSP.cpp; path = src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp; sourceTree = SOURCE_ROOT; }; - F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; }; + F51CEF860F5C64A5004F4602 /* DVDInputStreamHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDInputStreamHTSP.cpp; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp; sourceTree = SOURCE_ROOT; }; + F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; }; F51CF2CE0F6055A4004F4602 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = ""; }; F51CF2CF0F6055A4004F4602 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = ""; }; F52A733C1560BC34005B1A0B /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; F52B063911869862004B1D66 /* Skin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skin.h; sourceTree = ""; }; F52B063A11869862004B1D66 /* Skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skin.cpp; sourceTree = ""; }; - F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; }; - F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDVideoCodecVDA.h; path = src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h; sourceTree = SOURCE_ROOT; }; + F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; }; + F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDVideoCodecVDA.h; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h; sourceTree = SOURCE_ROOT; }; F52BFFD9115D5574004B1D66 /* AddonStatusHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonStatusHandler.h; sourceTree = ""; }; F52BFFDA115D5574004B1D66 /* AddonStatusHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonStatusHandler.cpp; sourceTree = ""; }; F52CC5EE1713AAA200113454 /* DirectoryNodeGrouped.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryNodeGrouped.cpp; sourceTree = ""; }; @@ -6066,8 +6066,8 @@ F54C51E20F1E787700D46E3C /* karaokelyricsfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricsfactory.cpp; sourceTree = ""; }; F54C51E30F1E787700D46E3C /* karaokelyricstextlrc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricstextlrc.cpp; sourceTree = ""; }; F54C51E40F1E787700D46E3C /* karaokelyricstext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokelyricstext.cpp; sourceTree = ""; }; - F55110430F5C3C0000955236 /* DVDDemuxHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDDemuxHTSP.h; path = src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h; sourceTree = SOURCE_ROOT; }; - F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDDemuxHTSP.cpp; path = src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp; sourceTree = SOURCE_ROOT; }; + F55110430F5C3C0000955236 /* DVDDemuxHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDDemuxHTSP.h; path = xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h; sourceTree = SOURCE_ROOT; }; + F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDDemuxHTSP.cpp; path = xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp; sourceTree = SOURCE_ROOT; }; F551106C0F5C424700955236 /* hts_strtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hts_strtab.h; sourceTree = ""; }; F551106D0F5C424700955236 /* htsatomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = htsatomic.c; sourceTree = ""; }; F551106E0F5C424700955236 /* htsatomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = htsatomic.h; sourceTree = ""; }; @@ -6265,8 +6265,8 @@ F5EA021B0F6DA7E8005C2EC5 /* PowerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PowerManager.h; sourceTree = ""; }; F5EA02200F6DA85C005C2EC5 /* CocoaPowerSyscall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocoaPowerSyscall.cpp; sourceTree = ""; }; F5EA02210F6DA85C005C2EC5 /* CocoaPowerSyscall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaPowerSyscall.h; sourceTree = ""; }; - F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CocoaInterface.mm; path = src/osx/CocoaInterface.mm; sourceTree = SOURCE_ROOT; }; - F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocoaInterface.h; path = src/osx/CocoaInterface.h; sourceTree = SOURCE_ROOT; }; + F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CocoaInterface.mm; path = xbmc/osx/CocoaInterface.mm; sourceTree = SOURCE_ROOT; }; + F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocoaInterface.h; path = xbmc/osx/CocoaInterface.h; sourceTree = SOURCE_ROOT; }; F5ED8D6A1551F91400842059 /* BlurayDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlurayDirectory.cpp; sourceTree = ""; }; F5ED8D6B1551F91400842059 /* BlurayDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlurayDirectory.h; sourceTree = ""; }; F5ED908615538DCE00842059 /* XBMCTinyXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCTinyXML.cpp; sourceTree = ""; }; @@ -6399,7 +6399,7 @@ DFFA43CE19104BFA00C3923B /* media */, C6859E96029091FE04C91782 /* docs */, E38E185C0D25F9FA00618676 /* lib */, - E38E14610D25F9F900618676 /* src */, + E38E14610D25F9F900618676 /* xbmc */, ); name = Source; sourceTree = ""; @@ -8575,7 +8575,7 @@ path = osx; sourceTree = ""; }; - E38E14610D25F9F900618676 /* src */ = { + E38E14610D25F9F900618676 /* xbmc */ = { isa = PBXGroup; children = ( 18B49FF01152BEEB001AF8A6 /* addons */, @@ -8691,7 +8691,7 @@ EC720A9B1550927000FFD782 /* XbmcContext.cpp */, EC720A9C1550927000FFD782 /* XbmcContext.h */, ); - path = src; + path = xbmc; sourceTree = ""; }; E38E147F0D25F9F900618676 /* cdrip */ = { @@ -14312,10 +14312,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", $SRCROOT, - src, - src/linux, - src/osx, - src/cores/dvdplayer, + xbmc, + xbmc/linux, + xbmc/osx, + xbmc/cores/dvdplayer, lib, lib/ffmpeg, addons/library.xbmc.addon, @@ -14326,7 +14326,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = $SRCROOT/src/osx/Info.plist; + INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist; INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -14337,9 +14337,9 @@ "$(SRCROOT)/lib/cmyth/librefmem", "$(SRCROOT)/lib/libsquish", "$(SRCROOT)/lib/SlingboxLib", - "$(SRCROOT)/src/interfaces/json-rpc", - "\"$(SRCROOT)/src/interfaces/python\"", - "\"$(SRCROOT)/src/interfaces/legacy\"", + "$(SRCROOT)/xbmc/interfaces/json-rpc", + "\"$(SRCROOT)/xbmc/interfaces/python\"", + "\"$(SRCROOT)/xbmc/interfaces/legacy\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; OTHER_CPLUSPLUSFLAGS = ( @@ -14378,10 +14378,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", $SRCROOT, - src, - src/linux, - src/osx, - src/cores/dvdplayer, + xbmc, + xbmc/linux, + xbmc/osx, + xbmc/cores/dvdplayer, lib, lib/ffmpeg, addons/library.xbmc.addon, @@ -14392,7 +14392,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = $SRCROOT/src/osx/Info.plist; + INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist; INSTALL_PATH = /usr/local/bin; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -14403,9 +14403,9 @@ "$(SRCROOT)/lib/cmyth/librefmem", "$(SRCROOT)/lib/libsquish", "$(SRCROOT)/lib/SlingboxLib", - "$(SRCROOT)/src/interfaces/json-rpc", - "\"$(SRCROOT)/src/interfaces/python\"", - "\"$(SRCROOT)/src/interfaces/legacy\"", + "$(SRCROOT)/xbmc/interfaces/json-rpc", + "\"$(SRCROOT)/xbmc/interfaces/python\"", + "\"$(SRCROOT)/xbmc/interfaces/legacy\"", ); LINK_WITH_STANDARD_LIBRARIES = YES; OTHER_CPLUSPLUSFLAGS = ( @@ -14490,12 +14490,12 @@ GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( $SRCROOT, - src, - src/osx, - src/linux, - src/cores/dvdplayer, - src/cores/AudioEngine, - src/cores/AudioEngine/Utils, + xbmc, + xbmc/osx, + xbmc/linux, + xbmc/cores/dvdplayer, + xbmc/cores/AudioEngine, + xbmc/cores/AudioEngine/Utils, lib, addons/library.xbmc.addon, $XBMC_DEPENDS/include, @@ -14504,7 +14504,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = "$SRCROOT/src/osx/atv2/XBMCATV2-Info.plist"; + INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; LIBRARY_SEARCH_PATHS = ( @@ -14515,9 +14515,9 @@ "\"$(SRCROOT)/lib/cmyth/librefmem\"", "\"$(SRCROOT)/lib/libsquish\"", "\"$(SRCROOT)/lib/SlingboxLib\"", - "\"$(SRCROOT)/src/interfaces/json-rpc\"", - "\"$(SRCROOT)/src/interfaces/legacy\"", - "\"$(SRCROOT)/src/interfaces/python\"", + "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"", + "\"$(SRCROOT)/xbmc/interfaces/legacy\"", + "\"$(SRCROOT)/xbmc/interfaces/python\"", ); PLIST_FILE_OUTPUT_FORMAT = xml; PREBINDING = NO; @@ -14551,12 +14551,12 @@ GCC_VERSION = 4.2; HEADER_SEARCH_PATHS = ( $SRCROOT, - src, - src/osx, - src/linux, - src/cores/dvdplayer, - src/cores/AudioEngine, - src/cores/AudioEngine/Utils, + xbmc, + xbmc/osx, + xbmc/linux, + xbmc/cores/dvdplayer, + xbmc/cores/AudioEngine, + xbmc/cores/AudioEngine/Utils, lib, addons/library.xbmc.addon, $XBMC_DEPENDS/include, @@ -14565,7 +14565,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = "$SRCROOT/src/osx/atv2/XBMCATV2-Info.plist"; + INFOPLIST_FILE = "$SRCROOT/xbmc/osx/atv2/XBMCATV2-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; LIBRARY_SEARCH_PATHS = ( @@ -14576,9 +14576,9 @@ "\"$(SRCROOT)/lib/cmyth/librefmem\"", "\"$(SRCROOT)/lib/libsquish\"", "\"$(SRCROOT)/lib/SlingboxLib\"", - "\"$(SRCROOT)/src/interfaces/json-rpc\"", - "\"$(SRCROOT)/src/interfaces/legacy\"", - "\"$(SRCROOT)/src/interfaces/python\"", + "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"", + "\"$(SRCROOT)/xbmc/interfaces/legacy\"", + "\"$(SRCROOT)/xbmc/interfaces/python\"", ); PLIST_FILE_OUTPUT_FORMAT = xml; PREBINDING = NO; @@ -14613,10 +14613,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", $SRCROOT, - src, - src/linux, - src/osx, - src/cores/dvdplayer, + xbmc, + xbmc/linux, + xbmc/osx, + xbmc/cores/dvdplayer, lib, addons/library.xbmc.addon, $XBMC_DEPENDS/include, @@ -14626,7 +14626,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = "$SRCROOT/src/osx/ios/XBMCIOS-Info.plist"; + INFOPLIST_FILE = "$SRCROOT/xbmc/osx/ios/XBMCIOS-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -14653,10 +14653,10 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", $SRCROOT, - src, - src/linux, - src/osx, - src/cores/dvdplayer, + xbmc, + xbmc/linux, + xbmc/osx, + xbmc/cores/dvdplayer, lib, addons/library.xbmc.addon, $XBMC_DEPENDS/include, @@ -14666,7 +14666,7 @@ $XBMC_DEPENDS/include/python2.6, $XBMC_DEPENDS/include/libxml2, ); - INFOPLIST_FILE = "src/osx/ios/XBMCIOS-Info.plist"; + INFOPLIST_FILE = "xbmc/osx/ios/XBMCIOS-Info.plist"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; diff --git a/Makefile.in b/Makefile.in index baa0eeef41..f88c88b558 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,17 +17,17 @@ DVDPCODECS_DIRS= \ lib/libdvd ifeq (@USE_LIBSTAGEFRIGHT@,1) -DVDPCODECS_DIRS += src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS +DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS endif -DVDPLAYER_ARCHIVES=src/cores/dvdplayer/DVDPlayer.a \ - src/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ - src/cores/dvdplayer/DVDCodecs/Audio/Audio.a \ - src/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \ - src/cores/dvdplayer/DVDCodecs/Video/Video.a \ - src/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \ - src/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \ - src/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a +DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \ + xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \ + xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \ + xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \ + xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \ + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \ + xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \ + xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ lib/SlingboxLib/SlingboxLib.a \ @@ -35,115 +35,115 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \ lib/libXDAAP/libxdaap.a \ lib/libhts/libhts.a \ lib/libsquish/libsquish.a \ - src/addons/addons.a \ - src/cdrip/cdrip.a \ - src/cores/AudioEngine/audioengine.a \ - src/cores/DllLoader/dllloader.a \ - src/cores/DllLoader/exports/exports.a \ - src/cores/DllLoader/exports/util/exports_utils.a \ - src/cores/ExternalPlayer/ExternalPlayer.a \ - src/cores/VideoRenderers/VideoRenderer.a \ - src/cores/VideoRenderers/VideoShaders/VideoShaders.a \ - src/cores/cores.a \ - src/cores/paplayer/paplayer.a \ - src/cores/playercorefactory/playercorefactory.a \ - src/dbwrappers/dbwrappers.a \ - src/dialogs/dialogs.a \ - src/epg/epg.a \ - src/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \ - src/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \ - src/filesystem/filesystem.a \ - src/guilib/guilib.a \ - src/input/input.a \ - src/interfaces/generic/interfaces-generic.a \ - src/interfaces/info/info.a \ - src/interfaces/interfaces.a \ - src/interfaces/json-rpc/json-rpc.a \ - src/linux/linux.a \ - src/listproviders/listproviders.a \ - src/media/media.a \ - src/music/dialogs/musicdialogs.a \ - src/music/infoscanner/musicscanner.a \ - src/music/karaoke/karaoke.a \ - src/music/music.a \ - src/music/tags/musictags.a \ - src/music/windows/musicwindows.a \ - src/network/websocket/websocket.a \ - src/network/network.a \ - src/peripherals/bus/peripheral-bus.a \ - src/peripherals/devices/peripheral-devices.a \ - src/peripherals/dialogs/peripheral-dialogs.a \ - src/peripherals/peripherals.a \ - src/pictures/pictures.a \ - src/playlists/playlists.a \ - src/powermanagement/powermanagement.a \ - src/profiles/profiles.a \ - src/profiles/dialogs/profiles_dialogs.a \ - src/profiles/windows/profiles_windows.a \ - src/programs/programs.a \ - src/pvr/addons/pvraddons.a \ - src/pvr/channels/pvrchannels.a \ - src/pvr/dialogs/pvrdialogs.a \ - src/pvr/pvr.a \ - src/pvr/recordings/pvrrecordings.a \ - src/pvr/timers/pvrtimers.a \ - src/pvr/windows/pvrwindows.a \ - src/rendering/rendering.a \ - src/settings/settings.a \ - src/settings/dialogs/settings_dialogs.a \ - src/settings/lib/settings_lib.a \ - src/settings/windows/settings_windows.a \ - src/storage/storage.a \ - src/utils/utils.a \ - src/video/dialogs/videodialogs.a \ - src/video/videosync/videosync.a \ - src/video/video.a \ - src/video/windows/videowindows.a \ - src/view/view.a \ - src/windowing/windowing.a \ - src/windows/windows.a \ - src/xbmc.a \ - -NWAOBJSXBMC= src/threads/threads.a \ - src/commons/commons.a + xbmc/addons/addons.a \ + xbmc/cdrip/cdrip.a \ + xbmc/cores/AudioEngine/audioengine.a \ + xbmc/cores/DllLoader/dllloader.a \ + xbmc/cores/DllLoader/exports/exports.a \ + xbmc/cores/DllLoader/exports/util/exports_utils.a \ + xbmc/cores/ExternalPlayer/ExternalPlayer.a \ + xbmc/cores/VideoRenderers/VideoRenderer.a \ + xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \ + xbmc/cores/cores.a \ + xbmc/cores/paplayer/paplayer.a \ + xbmc/cores/playercorefactory/playercorefactory.a \ + xbmc/dbwrappers/dbwrappers.a \ + xbmc/dialogs/dialogs.a \ + xbmc/epg/epg.a \ + xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \ + xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \ + xbmc/filesystem/filesystem.a \ + xbmc/guilib/guilib.a \ + xbmc/input/input.a \ + xbmc/interfaces/generic/interfaces-generic.a \ + xbmc/interfaces/info/info.a \ + xbmc/interfaces/interfaces.a \ + xbmc/interfaces/json-rpc/json-rpc.a \ + xbmc/linux/linux.a \ + xbmc/listproviders/listproviders.a \ + xbmc/media/media.a \ + xbmc/music/dialogs/musicdialogs.a \ + xbmc/music/infoscanner/musicscanner.a \ + xbmc/music/karaoke/karaoke.a \ + xbmc/music/music.a \ + xbmc/music/tags/musictags.a \ + xbmc/music/windows/musicwindows.a \ + xbmc/network/websocket/websocket.a \ + xbmc/network/network.a \ + xbmc/peripherals/bus/peripheral-bus.a \ + xbmc/peripherals/devices/peripheral-devices.a \ + xbmc/peripherals/dialogs/peripheral-dialogs.a \ + xbmc/peripherals/peripherals.a \ + xbmc/pictures/pictures.a \ + xbmc/playlists/playlists.a \ + xbmc/powermanagement/powermanagement.a \ + xbmc/profiles/profiles.a \ + xbmc/profiles/dialogs/profiles_dialogs.a \ + xbmc/profiles/windows/profiles_windows.a \ + xbmc/programs/programs.a \ + xbmc/pvr/addons/pvraddons.a \ + xbmc/pvr/channels/pvrchannels.a \ + xbmc/pvr/dialogs/pvrdialogs.a \ + xbmc/pvr/pvr.a \ + xbmc/pvr/recordings/pvrrecordings.a \ + xbmc/pvr/timers/pvrtimers.a \ + xbmc/pvr/windows/pvrwindows.a \ + xbmc/rendering/rendering.a \ + xbmc/settings/settings.a \ + xbmc/settings/dialogs/settings_dialogs.a \ + xbmc/settings/lib/settings_lib.a \ + xbmc/settings/windows/settings_windows.a \ + xbmc/storage/storage.a \ + xbmc/utils/utils.a \ + xbmc/video/dialogs/videodialogs.a \ + xbmc/video/videosync/videosync.a \ + xbmc/video/video.a \ + xbmc/video/windows/videowindows.a \ + xbmc/view/view.a \ + xbmc/windowing/windowing.a \ + xbmc/windows/windows.a \ + xbmc/xbmc.a \ + +NWAOBJSXBMC= xbmc/threads/threads.a \ + xbmc/commons/commons.a ifeq (@USE_WEB_SERVER@,1) -DIRECTORY_ARCHIVES += src/network/httprequesthandler/httprequesthandlers.a +DIRECTORY_ARCHIVES += xbmc/network/httprequesthandler/httprequesthandlers.a endif -DIRECTORY_ARCHIVES += src/interfaces/legacy/legacy.a -DIRECTORY_ARCHIVES += src/interfaces/python/python_binding.a +DIRECTORY_ARCHIVES += xbmc/interfaces/legacy/legacy.a +DIRECTORY_ARCHIVES += xbmc/interfaces/python/python_binding.a ifeq (@USE_OPENGL@,1) -DIRECTORY_ARCHIVES += src/rendering/gl/rendering_gl.a +DIRECTORY_ARCHIVES += xbmc/rendering/gl/rendering_gl.a endif ifeq (@USE_OPENGLES@,1) -DIRECTORY_ARCHIVES += src/rendering/gles/rendering_gles.a -DIRECTORY_ARCHIVES += src/windowing/egl/windowing_egl.a -DIRECTORY_ARCHIVES += src/visualizations/EGLHelpers/eglhelpers.a +DIRECTORY_ARCHIVES += xbmc/rendering/gles/rendering_gles.a +DIRECTORY_ARCHIVES += xbmc/windowing/egl/windowing_egl.a +DIRECTORY_ARCHIVES += xbmc/visualizations/EGLHelpers/eglhelpers.a endif ifeq (@USE_UPNP@,1) DIRECTORY_ARCHIVES += lib/libUPnP/libupnp.a \ - src/network/upnp/upnp.a + xbmc/network/upnp/upnp.a endif ifeq (@USE_MDNSEMBEDDED@,1) -DIRECTORY_ARCHIVES += src/network/mdns/mdns.a +DIRECTORY_ARCHIVES += xbmc/network/mdns/mdns.a endif INSTALL_FILTER = .*visualization\.dxspectrum.* INSTALL_FILTER += .*visualization\.milkdrop.* ifeq ($(findstring osx,@ARCH@),osx) -DIRECTORY_ARCHIVES += src/osx/osx.a -DIRECTORY_ARCHIVES += src/network/osx/network.a -DIRECTORY_ARCHIVES += src/network/linux/network_linux.a -DIRECTORY_ARCHIVES += src/powermanagement/osx/powermanagement.a -DIRECTORY_ARCHIVES += src/storage/osx/storage.a -DIRECTORY_ARCHIVES += src/windowing/osx/windowing_osx.a +DIRECTORY_ARCHIVES += xbmc/osx/osx.a +DIRECTORY_ARCHIVES += xbmc/network/osx/network.a +DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a +DIRECTORY_ARCHIVES += xbmc/powermanagement/osx/powermanagement.a +DIRECTORY_ARCHIVES += xbmc/storage/osx/storage.a +DIRECTORY_ARCHIVES += xbmc/windowing/osx/windowing_osx.a INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.* INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.* INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.* @@ -152,25 +152,25 @@ INSTALL_FILTER += .*repository\.pvr-ios\.xbmc\.org.* INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.* INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.* ifeq (@USE_ANDROID@,1) -DIRECTORY_ARCHIVES += src/input/linux/input_linux.a -DIRECTORY_ARCHIVES += src/input/touch/input_touch.a -DIRECTORY_ARCHIVES += src/input/touch/generic/input_touch_generic.a -DIRECTORY_ARCHIVES += src/network/linux/network_linux.a -DIRECTORY_ARCHIVES += src/powermanagement/android/powermanagement_android.a -DIRECTORY_ARCHIVES += src/storage/android/storage_android.a -DIRECTORY_ARCHIVES += src/windowing/X11/windowing_X11.a +DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a +DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a +DIRECTORY_ARCHIVES += xbmc/input/touch/generic/input_touch_generic.a +DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a +DIRECTORY_ARCHIVES += xbmc/powermanagement/android/powermanagement_android.a +DIRECTORY_ARCHIVES += xbmc/storage/android/storage_android.a +DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a else -DIRECTORY_ARCHIVES += src/input/linux/input_linux.a -DIRECTORY_ARCHIVES += src/network/linux/network_linux.a -DIRECTORY_ARCHIVES += src/powermanagement/linux/powermanagement_linux.a -DIRECTORY_ARCHIVES += src/storage/linux/storage_linux.a -DIRECTORY_ARCHIVES += src/windowing/X11/windowing_X11.a +DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a +DIRECTORY_ARCHIVES += xbmc/network/linux/network_linux.a +DIRECTORY_ARCHIVES += xbmc/powermanagement/linux/powermanagement_linux.a +DIRECTORY_ARCHIVES += xbmc/storage/linux/storage_linux.a +DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a INSTALL_FILTER += .*repository\.pvr-android\.xbmc\.org.* endif endif ifeq ($(findstring freebsd,@ARCH@),freebsd) -DIRECTORY_ARCHIVES += src/freebsd/freebsd.a +DIRECTORY_ARCHIVES += xbmc/freebsd/freebsd.a endif ifeq (@HAVE_XBMC_NONFREE@,1) @@ -178,14 +178,14 @@ DIRECTORY_ARCHIVES += lib/UnrarXLib/UnrarXLib.a endif ifeq (@USE_ANDROID@,1) -DIRECTORY_ARCHIVES += src/android/loader/AndroidDyload.a -DIRECTORY_ARCHIVES += src/windowing/android/windowing_android.a -DIRECTORY_ARCHIVES += src/android/bionic_supplement/bionic_supplement.a -DIRECTORY_ARCHIVES += src/android/jni/jni.a +DIRECTORY_ARCHIVES += xbmc/android/loader/AndroidDyload.a +DIRECTORY_ARCHIVES += xbmc/windowing/android/windowing_android.a +DIRECTORY_ARCHIVES += xbmc/android/bionic_supplement/bionic_supplement.a +DIRECTORY_ARCHIVES += xbmc/android/jni/jni.a endif ifeq (@USE_OMXPLAYER@,1) -DIRECTORY_ARCHIVES += src/cores/omxplayer/omxplayer.a +DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a endif PAPCODECS_DIRS= \ @@ -215,37 +215,37 @@ endif SS_DIRS= ifneq (@DISABLE_RSXS@,1) - SS_DIRS+= src/screensavers/rsxs-0.9/xbmc + SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc else INSTALL_FILTER+= .*screensaver\.rsxs.* endif ifneq (@DISABLE_SPECTRUM@,1) - VIS_DIRS+= src/visualizations/OpenGLSpectrum + VIS_DIRS+= xbmc/visualizations/OpenGLSpectrum else INSTALL_FILTER+= .*visualization\.glspectrum.* endif ifneq (@DISABLE_WAVEFORM@,1) - VIS_DIRS+= src/visualizations/WaveForm + VIS_DIRS+= xbmc/visualizations/WaveForm else INSTALL_FILTER+= .*visualization\.waveform.* endif ifneq (@DISABLE_FISHBMC@,1) - VIS_DIRS+= src/visualizations/fishBMC + VIS_DIRS+= xbmc/visualizations/fishBMC else INSTALL_FILTER+= .*visualization\.fishbmc.* endif ifneq (@DISABLE_PROJECTM@,1) - VIS_DIRS+= src/visualizations/XBMCProjectM + VIS_DIRS+= xbmc/visualizations/XBMCProjectM else INSTALL_FILTER+= .*visualization\.projectm.* endif ifneq (@DISABLE_GOOM@,1) - VIS_DIRS+=src/visualizations/Goom + VIS_DIRS+=xbmc/visualizations/Goom else INSTALL_FILTER+= .*visualization\.goom.* endif @@ -290,30 +290,30 @@ GTEST_DIR = lib/gtest GTEST_INCLUDES = -I$(GTEST_DIR)/include GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a -CHECK_DIRS = src/addons/test \ - src/filesystem/test \ - src/music/tags/test \ - src/utils/test \ - src/video/test \ - src/threads/test \ - src/interfaces/python/test \ - src/cores/AudioEngine/Sinks/test \ - src/test -CHECK_LIBS = src/addons/test/addonsTest.a \ - src/filesystem/test/filesystemTest.a \ - src/music/tags/test/tagsTest.a \ - src/utils/test/utilsTest.a \ - src/video/test/videoTest.a \ - src/threads/test/threadTest.a \ - src/interfaces/python/test/pythonSwigTest.a \ - src/cores/AudioEngine/Sinks/test/AESinkTest.a \ - src/test/xbmc-test.a +CHECK_DIRS = xbmc/addons/test \ + xbmc/filesystem/test \ + xbmc/music/tags/test \ + xbmc/utils/test \ + xbmc/video/test \ + xbmc/threads/test \ + xbmc/interfaces/python/test \ + xbmc/cores/AudioEngine/Sinks/test \ + xbmc/test +CHECK_LIBS = xbmc/addons/test/addonsTest.a \ + xbmc/filesystem/test/filesystemTest.a \ + xbmc/music/tags/test/tagsTest.a \ + xbmc/utils/test/utilsTest.a \ + xbmc/video/test/videoTest.a \ + xbmc/threads/test/threadTest.a \ + xbmc/interfaces/python/test/pythonSwigTest.a \ + xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a \ + xbmc/test/xbmc-test.a ifeq (@USE_WAYLAND@,1) -CHECK_LIBS += src/windowing/tests/wayland/test_wayland.a +CHECK_LIBS += xbmc/windowing/tests/wayland/test_wayland.a ifeq (@USE_WAYLAND_TEST_EXTENSION@,1) -WAYLAND_TEST_MODULE = src/windowing/tests/wayland/xbmc-wayland-test-extension.so +WAYLAND_TEST_MODULE = xbmc/windowing/tests/wayland/xbmc-wayland-test-extension.so $(WAYLAND_TEST_MODULE): force $(MAKE) -C $(@D) $(@F) CHECK_EXTENSIONS = $(WAYLAND_TEST_MODULE) @@ -324,7 +324,7 @@ endif ifeq (@USE_SSE4@,1) LIBSSE4+=sse4 sse4 : force - $(MAKE) -C src/linux/sse4 + $(MAKE) -C xbmc/linux/sse4 endif CHECK_PROGRAMS = @APP_NAME_LC@-test @@ -362,7 +362,7 @@ skins: endif # Setup some dependencies for subdir makes -src/cores/paplayer/paplayer.a: papcodecs +xbmc/cores/paplayer/paplayer.a: papcodecs $(DVDPLAYER_ARCHIVES) : dvdpcodecs lib/cpluff/libcpluff/.libs/libcpluff.a: force @@ -377,15 +377,15 @@ ifeq ($(findstring osx,@ARCH@), osx) else $(CXX) $(LDFLAGS) -shared -o $@ -Wl,--whole-archive $< \ -Wl,--no-whole-archive \ - `cat src/cores/DllLoader/exports/wrapper.def` src/cores/DllLoader/exports/wrapper.o -lexpat + `cat xbmc/cores/DllLoader/exports/wrapper.def` xbmc/cores/DllLoader/exports/wrapper.o -lexpat endif -exports: src/cores/DllLoader/exports/exports.a src/cores/DllLoader/exports/util/exports_utils.a - $(MAKE) -C src/cores/DllLoader/exports wrapper.def -dllloader: exports src/cores/DllLoader/dllloader.a +exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a + $(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def +dllloader: exports xbmc/cores/DllLoader/dllloader.a ifeq (@USE_OPENGLES@,1) -EGLHELPERS=src/visualizations/EGLHelpers/eglhelpers.a +EGLHELPERS=xbmc/visualizations/EGLHelpers/eglhelpers.a endif $(VIS_DIRS): force exports $(EGLHELPERS) @@ -408,7 +408,7 @@ dvdpcodecs: dllloader ifeq (@USE_LIBSTAGEFRIGHT@,1) dvdpextcodecs: lib@APP_NAME_LC@.so - $(MAKE) -C src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS + $(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS else dvdpextcodecs: endif @@ -466,20 +466,20 @@ xcode_depends: \ lib/SlingboxLib/SlingboxLib.a DYNOBJSXBMC= \ - src/linux/linux.a \ - src/network/network.a \ - src/video/windows/videowindows.a \ - src/utils/utils.a \ - src/cores/DllLoader/exports/util/exports_utils.a \ - src/cores/DllLoader/exports/exports.a \ - src/settings/settings.a \ - src/video/video.a \ - src/pvr/addons/pvraddons.a \ - src/pvr/windows/pvrwindows.a \ - src/guilib/guilib.a # must be dynamic to avoid linker errors + xbmc/linux/linux.a \ + xbmc/network/network.a \ + xbmc/video/windows/videowindows.a \ + xbmc/utils/utils.a \ + xbmc/cores/DllLoader/exports/util/exports_utils.a \ + xbmc/cores/DllLoader/exports/exports.a \ + xbmc/settings/settings.a \ + xbmc/video/video.a \ + xbmc/pvr/addons/pvraddons.a \ + xbmc/pvr/windows/pvrwindows.a \ + xbmc/guilib/guilib.a # must be dynamic to avoid linker errors ifeq ($(findstring freebsd,@ARCH@),freebsd) -DYNOBJSXBMC+= src/freebsd/freebsd.a +DYNOBJSXBMC+= xbmc/freebsd/freebsd.a endif ifeq (@USE_STATIC_FFMPEG@,1) @@ -497,9 +497,9 @@ $(FFMPEGOBJS): dvdpcodecs endif ifeq (@USE_ANDROID@,1) -MAINOBJS+=src/android/activity/activity.a +MAINOBJS+=xbmc/android/activity/activity.a else -MAINOBJS+=src/main/main.a +MAINOBJS+=xbmc/main/main.a endif # USE_ANDROID @@ -509,13 +509,13 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC)) BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS)) DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \ - $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) src/main + $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force @$(MAKE) $(if $(V),,-s) -C $(@D) # Binary Addon bindings -include src/addons/addon-bindings.mk +include xbmc/addons/addon-bindings.mk lib@APP_NAME_LC@.so: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS) ifeq ($(findstring osx,@ARCH@), osx) @@ -540,7 +540,7 @@ else $(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o @APP_NAME_LC@-xrandr xbmc-xrandr.c -lXrandr -lX11 -lm endif -tools/TexturePacker/TexturePacker: src/guilib/XBTF.h +tools/TexturePacker/TexturePacker: xbmc/guilib/XBTF.h $(MAKE) -C tools/TexturePacker/ diff --git a/Makefile.include.in b/Makefile.include.in index 7a82e70cb4..481da57c66 100644 --- a/Makefile.include.in +++ b/Makefile.include.in @@ -38,14 +38,14 @@ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@ LDFLAGS+=@LDFLAGS@ LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@ INCLUDES+=-I@abs_top_srcdir@/lib -INCLUDES+=-I@abs_top_srcdir@/src +INCLUDES+=-I@abs_top_srcdir@/xbmc INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec INCLUDES+=$(sort @INCLUDES@) -INCLUDES+=-I@abs_top_srcdir@/src/linux -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/linux +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer DEFINES+= \ @ARCH_DEFINES@ \ -D_FILE_DEFINED \ @@ -57,7 +57,7 @@ DEFINES+= \ @DEFS@ \ ifeq ($(findstring osx,$(ARCH)), osx) - INCLUDES+=-I@abs_top_srcdir@/src/osx + INCLUDES+=-I@abs_top_srcdir@/xbmc/osx endif ifeq ($(ARCH), powerpc-osx) diff --git a/bootstrap.mk b/bootstrap.mk index 0a30fee331..8bc4795b92 100644 --- a/bootstrap.mk +++ b/bootstrap.mk @@ -1,6 +1,6 @@ BOOTSTRAP_SUBDIRS += configure.in -BOOTSTRAP_SUBDIRS += src/screensavers/rsxs-0.9/configure.ac -BOOTSTRAP_SUBDIRS += src/visualizations/Goom/goom2k4-0/configure.in +BOOTSTRAP_SUBDIRS += xbmc/screensavers/rsxs-0.9/configure.ac +BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.in BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac diff --git a/codegenerator.mk b/codegenerator.mk index a037bfefaa..5ecb0c0273 100644 --- a/codegenerator.mk +++ b/codegenerator.mk @@ -1,5 +1,5 @@ TOPDIR ?= . -INTERFACES_DIR ?= src/interfaces +INTERFACES_DIR ?= xbmc/interfaces JAVA ?= $(shell which java) ifeq ($(JAVA),) @@ -35,7 +35,7 @@ GENERATED += $(GENDIR)/AddonModuleXbmcplugin.cpp GENERATED += $(GENDIR)/AddonModuleXbmcaddon.cpp GENERATED += $(GENDIR)/AddonModuleXbmcvfs.cpp -GENERATE_DEPS += $(TOPDIR)/src/interfaces/legacy/*.h $(TOPDIR)/src/interfaces/python/typemaps/*.intm $(TOPDIR)/src/interfaces/python/typemaps/*.outtm +GENERATE_DEPS += $(TOPDIR)/xbmc/interfaces/legacy/*.h $(TOPDIR)/xbmc/interfaces/python/typemaps/*.intm $(TOPDIR)/xbmc/interfaces/python/typemaps/*.outtm vpath %.i $(INTERFACES_DIR)/swig @@ -49,7 +49,7 @@ $(GENDIR)/%.cpp: $(GENDIR)/%.xml $(JAVA) $(SWIG) $(DOXY_XML_PATH) $(GENDIR)/%.xml: %.i $(SWIG) $(JAVA) $(GENERATE_DEPS) mkdir -p $(GENDIR) - $(SWIG) -w401 -c++ -o $@ -xml -I$(TOPDIR)/src -xmllang python $< + $(SWIG) -w401 -c++ -o $@ -xml -I$(TOPDIR)/xbmc -xmllang python $< codegenerated: $(DOXYGEN) $(SWIG) $(JAVA) $(GENERATED) $(GENERATED_JSON) $(GENERATED_ADDON_JSON) diff --git a/configure.in b/configure.in index 60bdd0448f..6cfe954dcd 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([kodi], [14.9.701], [http://issues.kodi.tv]) -AC_CONFIG_HEADERS([src/config.h]) +AC_CONFIG_HEADERS([xbmc/config.h]) AH_TOP([#pragma once]) m4_include([m4/ax_prog_cc_for_build.m4]) m4_include([m4/ax_prog_cxx_for_build.m4]) @@ -788,7 +788,7 @@ if echo "$ARCH" | grep -q "freebsd" ; then fi if test "$host_vendor" = "apple" ; then # standard application paths - INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/src/osx" + INCLUDES="$INCLUDES -I\$(abs_top_srcdir)/xbmc/osx" if test "$use_arch" != "arm"; then LIBS="$LIBS -framework ApplicationServices" LIBS="$LIBS -framework AudioUnit" @@ -2421,23 +2421,23 @@ fi OUTPUT_FILES="Makefile \ Makefile.include \ addons/skin.confluence/media/Makefile \ - src/Makefile \ - src/cdrip/Makefile \ - src/cores/Makefile \ - src/cores/VideoRenderers/Makefile \ - src/cores/dvdplayer/Makefile \ + xbmc/Makefile \ + xbmc/cdrip/Makefile \ + xbmc/cores/Makefile \ + xbmc/cores/VideoRenderers/Makefile \ + xbmc/cores/dvdplayer/Makefile \ lib/libdvd/Makefile \ - src/cores/DllLoader/Makefile \ - src/cores/DllLoader/exports/Makefile \ - src/cores/dvdplayer/DVDCodecs/Makefile \ - src/cores/dvdplayer/DVDCodecs/Audio/Makefile \ - src/cores/dvdplayer/DVDCodecs/Overlay/Makefile \ - src/cores/dvdplayer/DVDCodecs/Video/Makefile \ - src/cores/dvdplayer/DVDDemuxers/Makefile \ - src/cores/dvdplayer/DVDSubtitles/Makefile \ - src/cores/AudioEngine/Makefile \ - src/cores/paplayer/Makefile \ - src/cores/omxplayer/Makefile \ + xbmc/cores/DllLoader/Makefile \ + xbmc/cores/DllLoader/exports/Makefile \ + xbmc/cores/dvdplayer/DVDCodecs/Makefile \ + xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile \ + xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile \ + xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile \ + xbmc/cores/dvdplayer/DVDDemuxers/Makefile \ + xbmc/cores/dvdplayer/DVDSubtitles/Makefile \ + xbmc/cores/AudioEngine/Makefile \ + xbmc/cores/paplayer/Makefile \ + xbmc/cores/omxplayer/Makefile \ lib/timidity/Makefile \ lib/asap/Makefile \ lib/nosefart/Makefile \ @@ -2445,14 +2445,14 @@ OUTPUT_FILES="Makefile \ lib/vgmstream/Makefile \ lib/snesapu/SNES/SNESAPU/Makefile \ lib/stsound/StSoundLibrary/Makefile \ - src/cores/playercorefactory/Makefile \ - src/music/karaoke/Makefile \ - src/osx/Makefile \ - src/guilib/Makefile \ - src/input/linux/Makefile \ - src/interfaces/Makefile \ - src/network/Makefile \ - src/network/upnp/Makefile \ + xbmc/cores/playercorefactory/Makefile \ + xbmc/music/karaoke/Makefile \ + xbmc/osx/Makefile \ + xbmc/guilib/Makefile \ + xbmc/input/linux/Makefile \ + xbmc/interfaces/Makefile \ + xbmc/network/Makefile \ + xbmc/network/upnp/Makefile \ lib/libRTV/Makefile \ lib/libexif/Makefile \ lib/libXDAAP/Makefile \ @@ -2461,24 +2461,24 @@ OUTPUT_FILES="Makefile \ lib/libsquish/Makefile \ lib/cximage-6.0/Makefile \ lib/libUPnP/Makefile \ - src/DllPaths_generated.h \ - src/DllPaths_generated_android.h \ - src/freebsd/Makefile \ - src/linux/Makefile \ - src/filesystem/Makefile \ - src/screensavers/rsxs-0.9/xbmc/Makefile \ - src/visualizations/XBMCProjectM/Makefile \ - src/visualizations/Goom/Makefile \ - src/visualizations/OpenGLSpectrum/Makefile \ - src/visualizations/fishBMC/Makefile \ - src/visualizations/WaveForm/Makefile \ - src/windowing/Makefile \ - src/windowing/egl/Makefile \ + xbmc/DllPaths_generated.h \ + xbmc/DllPaths_generated_android.h \ + xbmc/freebsd/Makefile \ + xbmc/linux/Makefile \ + xbmc/filesystem/Makefile \ + xbmc/screensavers/rsxs-0.9/xbmc/Makefile \ + xbmc/visualizations/XBMCProjectM/Makefile \ + xbmc/visualizations/Goom/Makefile \ + xbmc/visualizations/OpenGLSpectrum/Makefile \ + xbmc/visualizations/fishBMC/Makefile \ + xbmc/visualizations/WaveForm/Makefile \ + xbmc/windowing/Makefile \ + xbmc/windowing/egl/Makefile \ lib/addons/library.xbmc.addon/Makefile \ lib/addons/library.xbmc.codec/Makefile \ lib/addons/library.xbmc.gui/Makefile \ lib/addons/library.xbmc.pvr/Makefile \ - src/visualizations/EGLHelpers/Makefile \ + xbmc/visualizations/EGLHelpers/Makefile \ tools/Linux/${APP_NAME_LC}.sh \ tools/Linux/${APP_NAME_LC}-standalone.sh \ tools/Linux/${APP_NAME_LC}-xsession.desktop \ @@ -2487,13 +2487,13 @@ OUTPUT_FILES="Makefile \ tools/TexturePacker/Makefile \ tools/EventClients/Makefile \ tools/EventClients/Clients/OSXRemote/Makefile \ - src/peripherals/bus/Makefile \ - src/peripherals/devices/Makefile \ - src/android/activity/Makefile \ - src/android/loader/Makefile \ - src/android/jni/Makefile \ - src/utils/Makefile \ - src/main/Makefile \ + xbmc/peripherals/bus/Makefile \ + xbmc/peripherals/devices/Makefile \ + xbmc/android/activity/Makefile \ + xbmc/android/loader/Makefile \ + xbmc/android/jni/Makefile \ + xbmc/utils/Makefile \ + xbmc/main/Makefile \ tools/darwin/Configurations/App.xcconfig \ tools/darwin/Configurations/Common.xcconfig \ tools/darwin/packaging/ios/mkdeb-ios.sh \ @@ -2501,9 +2501,9 @@ OUTPUT_FILES="Makefile \ tools/darwin/packaging/osx/mkdmg-osx.sh \ tools/darwin/packaging/migrate_to_kodi_ios.sh \ tools/darwin/packaging/seatbeltunlock/mkdeb-seatbeltunlock.sh \ - src/osx/Info.plist \ - src/osx/ios/XBMCIOS-Info.plist \ - src/osx/atv2/XBMCATV2-Info.plist \ + xbmc/osx/Info.plist \ + xbmc/osx/ios/XBMCIOS-Info.plist \ + xbmc/osx/atv2/XBMCATV2-Info.plist \ project/cmake/kodi-config.cmake \ project/cmake/xbmc-config.cmake \ tools/android/packaging/xbmc/AndroidManifest.xml \ @@ -2516,7 +2516,7 @@ OUTPUT_FILES="Makefile \ addons/xbmc.addon/addon.xml" if test "$use_wayland" = "yes"; then -OUTPUT_FILES="$OUTPUT_FILES src/windowing/tests/wayland/Makefile" +OUTPUT_FILES="$OUTPUT_FILES xbmc/windowing/tests/wayland/Makefile" fi if test "$use_touch_skin" = "yes"; then @@ -2524,16 +2524,16 @@ OUTPUT_FILES="$OUTPUT_FILES addons/skin.re-touched/media/Makefile" fi if test "$use_codec_libstagefright" = "yes"; then -OUTPUT_FILES="$OUTPUT_FILES src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" +OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" fi if test "$use_sse4" = "yes"; then -OUTPUT_FILES="$OUTPUT_FILES src/linux/sse4/Makefile" +OUTPUT_FILES="$OUTPUT_FILES xbmc/linux/sse4/Makefile" fi OUTPUT_FILES="$OUTPUT_FILES \ - src/interfaces/python/Makefile \ - src/interfaces/python/test/Makefile" + xbmc/interfaces/python/Makefile \ + xbmc/interfaces/python/test/Makefile" # Line below is used so we can use AM_INIT_AUTOMAKE. The corresponding # .dummy.am does nothing. @@ -2705,7 +2705,7 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ --cc="$CC" ], [0]) -XB_CONFIG_MODULE([src/visualizations/XBMCProjectM/libprojectM],[ +XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[ set -x rm -f CMakeCache.txt && \ CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \ @@ -2727,7 +2727,7 @@ XB_CONFIG_MODULE([src/visualizations/XBMCProjectM/libprojectM],[ set +x ], [$DISABLE_PROJECTM]) -XB_CONFIG_MODULE([src/visualizations/Goom/goom2k4-0],[ +XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ ./configure \ CFLAGS="$CFLAGS" \ CXXFLAGS="$CXXFLAGS" \ @@ -2740,7 +2740,7 @@ XB_CONFIG_MODULE([src/visualizations/Goom/goom2k4-0],[ --with-pic ], [$DISABLE_GOOM]) -XB_CONFIG_MODULE([src/screensavers/rsxs-0.9/], [ +XB_CONFIG_MODULE([xbmc/screensavers/rsxs-0.9/], [ if test "$host_vendor" = "apple"; then # clang treats inlines different case $CC in diff --git a/language/English/strings.po b/language/English/strings.po index 4546f1151b..15090fccd8 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -13,7 +13,7 @@ msgstr "" "Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp #: system/settings/settings.xml msgctxt "#0" msgid "Programs" @@ -31,7 +31,7 @@ msgstr "" #: Used in Confluence #: system/settings/settings.xml -#: src/media/MediaTypes.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#3" msgid "Videos" msgstr "" @@ -42,13 +42,13 @@ msgid "TV-Guide" msgstr "" #: Used in Confluence -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#5" msgid "Settings" msgstr "" #: Unknown -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#6" msgid "Kodi SVN" msgstr "" @@ -383,12 +383,12 @@ msgctxt "#105" msgid "Sort by: Size" msgstr "" -#: src/dialogs/GUIDialogYesNo.cpp +#: xbmc/dialogs/GUIDialogYesNo.cpp msgctxt "#106" msgid "No" msgstr "" -#: src/dialogs/GUIDialogYesNo.cpp +#: xbmc/dialogs/GUIDialogYesNo.cpp msgctxt "#107" msgid "Yes" msgstr "" @@ -413,86 +413,86 @@ msgctxt "#112" msgid "Paused" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#113" msgid "Update failed" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#114" msgid "Installation failed" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#115" msgid "Copy" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#116" msgid "Move" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#117" msgid "Delete" msgstr "" -#: src/dialogs/GUIDialogFavourites.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#118" msgid "Rename" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#119" msgid "New folder" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#120" msgid "Confirm file copy" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#121" msgid "Confirm file move" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#122" msgid "Confirm delete" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#123" msgid "Copy these files?" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#124" msgid "Move these files?" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#125" msgid "Delete these files? - Deleting files cannot be undone!" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#126" msgid "Status" msgstr "" -#: src/dialogs/GUIDialogSelect.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogSelect.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#127" msgid "Objects" msgstr "" -#: src/addons/guidialogaddonsettings.cpp +#: xbmc/addons/guidialogaddonsettings.cpp #: system/settings/settings.xml msgctxt "#128" msgid "General" @@ -511,38 +511,38 @@ msgctxt "#131" msgid "Display" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#132" msgid "Albums" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#133" msgid "Artists" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#134" msgid "Songs" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp msgctxt "#135" msgid "Genres" msgstr "" @@ -551,7 +551,7 @@ msgctxt "#136" msgid "Playlists" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#137" msgid "Search" msgstr "" @@ -600,12 +600,12 @@ msgctxt "#148" msgid "DHCP" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#149" msgid "MAC address" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#150" msgid "IP address" msgstr "" @@ -638,7 +638,7 @@ msgctxt "#157" msgid "Video" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#158" msgid "Free memory" msgstr "" @@ -671,19 +671,19 @@ msgctxt "#165" msgid "Disc present" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp #: system/settings/settings.xml msgctxt "#166" msgid "Skin" msgstr "" -#: src/windows/GUIWindowFileManager.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#167" msgid "Cancel file operations" msgstr "" -#: src/settings/windows/GUIWindowSettingsCategory.cpp +#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp msgctxt "#168" msgid "%s- %s" msgstr "" @@ -698,8 +698,8 @@ msgctxt "#170" msgid "Adjust display refresh rate to match video" msgstr "" -#: src/playlists/SmartPlayList.cpp -#: src/utils/SortUtils.cpp +#: xbmc/playlists/SmartPlayList.cpp +#: xbmc/utils/SortUtils.cpp msgctxt "#171" msgid "Sort title" msgstr "" @@ -715,26 +715,26 @@ msgstr "" #empty string with id 174 -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#175" msgid "Moods" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#176" msgid "Styles" msgstr "" #empty strings from id 177 to 178 -#: src/media/MediaTypes.cpp -#: src/music/karaoke/GUIDialogKaraokeSongSelector.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp msgctxt "#179" msgid "Song" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#180" msgid "Duration" msgstr "" @@ -743,13 +743,13 @@ msgctxt "#181" msgid "Select album" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#182" msgid "Tracks" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#183" msgid "Review" msgstr "" @@ -762,8 +762,8 @@ msgctxt "#185" msgid "Searching album" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/dialogs/GUIDialogSelect.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/dialogs/GUIDialogSelect.cpp msgctxt "#186" msgid "OK" msgstr "" @@ -772,7 +772,7 @@ msgctxt "#187" msgid "No albums found!" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#188" msgid "Select all" msgstr "" @@ -801,7 +801,7 @@ msgctxt "#194" msgid "Searching..." msgstr "" -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#195" msgid "No info found!" msgstr "" @@ -818,7 +818,7 @@ msgctxt "#198" msgid "Loading movie details" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp #: system/settings/settings.xml msgctxt "#199" msgid "Web interface" @@ -830,19 +830,19 @@ msgstr "" #empty string with id 201 -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#202" msgid "Tagline" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#203" msgid "Plot outline" msgstr "" #empty string with id 204 -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#205" msgid "Votes" msgstr "" @@ -851,12 +851,12 @@ msgctxt "#206" msgid "Cast" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#207" msgid "Plot" msgstr "" -#: src/dialogs/GUIDialogPlayEject.cpp +#: xbmc/dialogs/GUIDialogPlayEject.cpp #: system/settings/settings.xml msgctxt "#208" msgid "Play" @@ -879,7 +879,7 @@ msgid "Calibrate user interface..." msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#214" msgid "Video calibration..." msgstr "" @@ -888,41 +888,41 @@ msgctxt "#215" msgid "Soften" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#216" msgid "Zoom amount" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#217" msgid "Pixel ratio" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#218" msgid "DVD drive" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp -#: src/dialogs/GUIDialogPlayEject.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogPlayEject.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#219" msgid "Please insert disc" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#220" msgid "Remote share" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#221" msgid "Network is not connected" msgstr "" @@ -937,7 +937,7 @@ msgctxt "#224" msgid "Speed" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#225" msgid "Vertical Shift" msgstr "" @@ -965,9 +965,9 @@ msgid "Video filters" msgstr "" #: system/peripherals.xml -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/dialogs/GUIDialogMediaSource.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp +#: xbmc/playlists/SmartPlaylist.cpp #: system/settings/settings.xml msgctxt "#231" msgid "None" @@ -1044,8 +1044,8 @@ msgctxt "#248" msgid "Language" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#249" msgid "Music" msgstr "" @@ -1081,7 +1081,7 @@ msgctxt "#256" msgid "Fetching CD information" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#257" msgid "Error" msgstr "" @@ -1140,7 +1140,7 @@ msgctxt "#270" msgid "Sort by: Album" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#271" msgid "Top 100" msgstr "" @@ -1189,7 +1189,7 @@ msgctxt "#282" msgid "Found %i items" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#283" msgid "Search results" msgstr "" @@ -1226,8 +1226,8 @@ msgctxt "#290" msgid "Dynamic range compression" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#291" msgid "Video" msgstr "" @@ -1281,7 +1281,7 @@ msgid "Language" msgstr "" #: system/peripherals.xml -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp #: system/settings/settings.xml msgctxt "#305" msgid "Enabled" @@ -1429,12 +1429,12 @@ msgctxt "#340" msgid "Various artists" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#341" msgid "Play disc" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#342" msgid "Movies" msgstr "" @@ -1443,9 +1443,9 @@ msgctxt "#343" msgid "Adjust framerate" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#344" msgid "Actors" msgstr "" @@ -1474,7 +1474,7 @@ msgctxt "#349" msgid "TrueHD capable receiver" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#350" msgid "Programs" msgstr "" @@ -1515,7 +1515,7 @@ msgctxt "#358" msgid "All albums" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#359" msgid "Recently added albums" msgstr "" @@ -1558,9 +1558,9 @@ msgctxt "#368" msgid "IMDb" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp msgctxt "#369" msgid "Title" msgstr "" @@ -1713,37 +1713,37 @@ msgctxt "#399" msgid "Speed units" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#400" msgid "Weather" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#401" msgid "Temp" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#402" msgid "Feels like" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#403" msgid "UV index" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#404" msgid "Wind" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#405" msgid "Dew point" msgstr "" -#: src/windows/GUIWindowWeather.cpp +#: xbmc/windows/GUIWindowWeather.cpp msgctxt "#406" msgid "Humidity" msgstr "" @@ -1770,7 +1770,7 @@ msgctxt "#413" msgid "Manual" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#414" msgid "No review for this album" msgstr "" @@ -1779,7 +1779,7 @@ msgctxt "#415" msgid "Downloading thumbnail..." msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#416" msgid "Not available" msgstr "" @@ -1835,7 +1835,7 @@ msgctxt "#428" msgid "Insert correct CD/DVD" msgstr "" -#: src/dialogs/GUIDialogPlayEject.cpp +#: xbmc/dialogs/GUIDialogPlayEject.cpp msgctxt "#429" msgid "Please insert the following disc:" msgstr "" @@ -1981,17 +1981,17 @@ msgctxt "#463" msgid "Backlight" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#464" msgid "Brightness" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#465" msgid "Contrast" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#466" msgid "Gamma" msgstr "" @@ -2026,7 +2026,7 @@ msgctxt "#476" msgid "Music & video" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#477" msgid "Unable to load playlist" msgstr "" @@ -2167,16 +2167,16 @@ msgctxt "#514" msgid "Manual settings" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#515" msgid "Genre" msgstr "" #empty string with id 516 -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#517" msgid "Recently played albums" msgstr "" @@ -2191,17 +2191,17 @@ msgstr "" #empty string with id 520 -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#521" msgid "Compilations" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#522" msgid "Remove source" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#523" msgid "Switch media" msgstr "" @@ -2300,7 +2300,7 @@ msgctxt "#546" msgid "Passthrough output device" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#547" msgid "No biography for this artist" msgstr "" @@ -2309,18 +2309,18 @@ msgctxt "#548" msgid "Downmix multichannel audio to stereo" msgstr "" -#: /src/pvr/windows/GUIViewStatePVR.cpp -#: /src/utils/SortUtils.cpp +#: /xbmc/xbmc/pvr/windows/GUIViewStatePVR.cpp +#: /xbmc/xbmc/utils/SortUtils.cpp msgctxt "#549" msgid "Number" msgstr "" -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#550" msgid "Sort by: %s" msgstr "" -#: src/view/GUIViewState.cpp +#: xbmc/view/GUIViewState.cpp msgctxt "#551" msgid "Name" msgstr "" @@ -2329,13 +2329,13 @@ msgctxt "#552" msgid "Date" msgstr "" -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp msgctxt "#553" msgid "Size" msgstr "" -#: src/filesystem/BlurayDirectory.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/BlurayDirectory.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#554" msgid "Track" msgstr "" @@ -2344,30 +2344,30 @@ msgctxt "#555" msgid "Time" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#556" msgid "Title" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#557" msgid "Artist" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#558" msgid "Album" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#559" msgid "Playlist" msgstr "" @@ -2376,29 +2376,29 @@ msgctxt "#560" msgid "ID" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#561" msgid "File" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#562" msgid "Year" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#563" msgid "Rating" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#564" msgid "Type" msgstr "" @@ -2407,57 +2407,57 @@ msgctxt "#565" msgid "Usage" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#566" msgid "Album artist" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#567" msgid "Play count" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#568" msgid "Last played" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#569" msgid "Comment" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#570" msgid "Date added" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#571" msgid "Default" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#572" msgid "Studio" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#573" msgid "Path" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#574" msgid "Country" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#575" msgid "In progress" msgstr "" @@ -2512,7 +2512,7 @@ msgctxt "#589" msgid "Party mode" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#590" msgid "Random" msgstr "" @@ -2604,7 +2604,7 @@ msgctxt "#613" msgid "Sample rate" msgstr "" -#: src/playlists/SmartPlayList.cpp +#: xbmc/playlists/SmartPlayList.cpp msgctxt "#614" msgid "Virtual folder" msgstr "" @@ -2650,40 +2650,40 @@ msgid "View mode" msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#630" msgid "Normal" msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#631" msgid "Zoom" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#632" msgid "Stretch 4:3" msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#633" msgid "Wide Zoom" msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#634" msgid "Stretch 16:9" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#635" msgid "Original Size" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#636" msgid "Custom" msgstr "" @@ -2756,8 +2756,8 @@ msgctxt "#651" msgid "Browse for library" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#652" msgid "Years" msgstr "" @@ -2778,7 +2778,7 @@ msgctxt "#656" msgid "Browse for playlist" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp msgctxt "#657" msgid "Browse for folder" msgstr "" @@ -2787,7 +2787,7 @@ msgctxt "#658" msgid "Song information" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#659" msgid "Non-linear stretch" msgstr "" @@ -2832,57 +2832,57 @@ msgctxt "#668" msgid "Specify component-specific logging..." msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#669" msgid "Verbose logging for SMB library" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#670" msgid "Verbose logging for CURL library (http, dav)" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#671" msgid "Verbose logging for CMYTH library" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#672" msgid "Verbose logging for FFMPEG libraries" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#673" msgid "Verbose logging for RTMP library" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#674" msgid "Verbose logging for DBUS calls" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#675" msgid "Verbose logging for JSON-RPC requests" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#676" msgid "Verbose logging for AUDIO component" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#677" msgid "Verbose logging for AirTunes library" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#678" msgid "Verbose logging for UPnP components" msgstr "" -#: src/settings/AdvancedSettings.cpp +#: xbmc/settings/AdvancedSettings.cpp msgctxt "#679" msgid "Verbose logging for CEC library" msgstr "" @@ -3066,7 +3066,7 @@ msgctxt "#743" msgid "Yellow" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#744" msgid "Files" msgstr "" @@ -3091,13 +3091,13 @@ msgctxt "#749" msgid "Mirror image" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#750" msgid "Are you sure?" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#751" msgid "Removing source" msgstr "" @@ -3246,7 +3246,7 @@ msgctxt "#788" msgid "Network interface disabled successfully." msgstr "" -#: src/network/GUIDialogAccessPoints.cpp +#: xbmc/network/GUIDialogAccessPoints.cpp msgctxt "#789" msgid "Wireless network name (ESSID)" msgstr "" @@ -3299,18 +3299,18 @@ msgctxt "#799" msgid "Library Update" msgstr "" -#: src/music/windows/GUIWindowMusicBase.cpp +#: xbmc/music/windows/GUIWindowMusicBase.cpp msgctxt "#800" msgid "Music library needs to rescan tags from files." msgstr "" -#: src/music/windows/GUIWindowMusicBase.cpp +#: xbmc/music/windows/GUIWindowMusicBase.cpp msgctxt "#801" msgid "Would you like to scan now?" msgstr "" #. Label of progess bar which shows the available/total space of pvr backend -#: src/pvr/PVRGUIInfo.cpp +#: xbmc/pvr/PVRGUIInfo.cpp msgctxt "#802" msgid "%s of %s available" msgstr "" @@ -3331,17 +3331,17 @@ msgstr "" #empty strings from id 853 to 996 -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#997" msgid "Add Pictures..." msgstr "" -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#998" msgid "Add Music..." msgstr "" -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#999" msgid "Add Videos..." msgstr "" @@ -3351,7 +3351,7 @@ msgctxt "#1000" msgid "Preview" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1001" msgid "Unable to connect" msgstr "" @@ -3360,12 +3360,12 @@ msgctxt "#1002" msgid "Kodi was unable to connect to the network location." msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1003" msgid "This could be due to the network not being connected." msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1004" msgid "Would you like to add it anyway?" msgstr "" @@ -3384,22 +3384,22 @@ msgctxt "#1008" msgid "Protocol" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1009" msgid "Server address" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1010" msgid "Server name" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1011" msgid "Remote path" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1012" msgid "Shared folder" msgstr "" @@ -3412,47 +3412,47 @@ msgctxt "#1014" msgid "Username" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1015" msgid "Browse for network server" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1016" msgid "Enter the network address of the server" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1017" msgid "Enter the path on the server" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1018" msgid "Enter the port number" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#1019" msgid "Enter the username" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1020" msgid "Add %s source" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1021" msgid "Enter the paths or browse for the media locations." msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1022" msgid "Enter a name for this media Source." msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#1023" msgid "Browse for new share" msgstr "" @@ -3461,24 +3461,24 @@ msgctxt "#1024" msgid "Browse" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1025" msgid "Could not retrieve directory information." msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#1026" msgid "Add source" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#1027" msgid "Edit source" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1028" msgid "Edit %s source" msgstr "" @@ -3487,9 +3487,9 @@ msgctxt "#1029" msgid "Enter the new label" msgstr "" -#: src/dialogs/GUIDialogFavourites.cpp -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/music/dialogs/GUIDialogSongInfo.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogSongInfo.cpp msgctxt "#1030" msgid "Browse for image" msgstr "" @@ -3498,7 +3498,7 @@ msgctxt "#1031" msgid "Browse for image folder" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#1032" msgid "Add network location..." msgstr "" @@ -3519,22 +3519,22 @@ msgctxt "#1036" msgid "Favourites" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#1037" msgid "Video Add-ons" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#1038" msgid "Music Add-ons" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#1039" msgid "Picture Add-ons" msgstr "" -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#1040" msgid "Loading directory" msgstr "" @@ -3547,7 +3547,7 @@ msgctxt "#1042" msgid "Retrieved %i of %i items" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#1043" msgid "Program Add-ons" msgstr "" @@ -3556,7 +3556,7 @@ msgctxt "#1044" msgid "Set plug-in thumb" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#1045" msgid "Add-on settings" msgstr "" @@ -3565,7 +3565,7 @@ msgctxt "#1046" msgid "Access points" msgstr "" -#: src/network/GUIDialogAccessPoints.cpp +#: xbmc/network/GUIDialogAccessPoints.cpp msgctxt "#1047" msgid "Other..." msgstr "" @@ -3579,7 +3579,7 @@ msgctxt "#1049" msgid "Script settings" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#1050" msgid "Singles" msgstr "" @@ -3623,7 +3623,7 @@ msgstr "" #empty strings from id 1186 to 1199 #strings 1186 to 1189 reserved for more proxy types -#: src/settings/win32.xml +#: xbmc/settings/win32.xml msgctxt "#1200" msgid "SMB client" msgstr "" @@ -3668,7 +3668,7 @@ msgctxt "#1212" msgid "Video" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#1213" msgid "Pictures" msgstr "" @@ -3802,7 +3802,7 @@ msgid "AirTunes" msgstr "" #. Filter movies/tvshows/music/episodes/artists/musicvideos/albums/songs -#: src/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp msgctxt "#1275" msgid "Filter %s" msgstr "" @@ -4211,12 +4211,12 @@ msgstr "" #empty strings from id 2051 to 2079 -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#2080" msgid "Empty list" msgstr "" -#: src/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIMediaWindow.cpp msgctxt "#2081" msgid "Went back to parent list because the active list has been emptied" msgstr "" @@ -4233,48 +4233,48 @@ msgstr "" #empty strings from id 2102 to 9999 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10000" msgid "Home" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10001" msgid "Programs" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10002" msgid "Pictures" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10003" msgid "File manager" msgstr "" -#: src/addons/GUIDialogAddonSettings.cpp -#: src/guilib/WindowIDs.h +#: xbmc/addons/GUIDialogAddonSettings.cpp +#: xbmc/guilib/WindowIDs.h msgctxt "#10004" msgid "Settings" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10005" msgid "Music" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10006" msgid "Videos" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10007" msgid "System information" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10008" msgid "Settings - General" msgstr "" @@ -4287,52 +4287,52 @@ msgctxt "#10010" msgid "Settings - Appearance - GUI Calibration" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10011" msgid "Settings - Videos - Screen Calibration" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10012" msgid "Settings - Pictures" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10013" msgid "Settings - Programs" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10014" msgid "Settings - Weather" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10015" msgid "Settings - Music" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10016" msgid "Settings - System" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10017" msgid "Settings - Videos" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10018" msgid "Settings - Network" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10019" msgid "Settings - Appearance" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10020" msgid "Scripts" msgstr "" @@ -4343,26 +4343,26 @@ msgstr "" #empty strings from id 10022 to 10024 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10025" msgid "Videos" msgstr "" #empty strings from id 10026 to 10027 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10028" msgid "Videos/Playlist" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10029" msgid "Login screen" msgstr "" #empty strings from id 10030 to 10033 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10034" msgid "Settings - Profiles" msgstr "" @@ -4387,17 +4387,17 @@ msgctxt "#10039" msgid "Expert" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10040" msgid "Add-on browser" msgstr "" -#: src/settings/windows/GUIWindowSettingsCategory.cpp +#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp msgctxt "#10041" msgid "Reset above settings to default" msgstr "" -#: src/settings/windows/GUIWindowSettingsCategory.cpp +#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp msgctxt "#10042" msgid "Are you sure you want to reset the settings in this category?" msgstr "" @@ -4414,99 +4414,99 @@ msgctxt "#10045" msgid "Resets all the visible settings to their default values." msgstr "" -#: src/settings/windows/GUIWindowSettingsCategory.cpp +#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp msgctxt "#10046" msgid "No categories available" msgstr "" -#: src/settings/windows/GUIWindowSettingsCategory.cpp +#: xbmc/settings/windows/GUIWindowSettingsCategory.cpp msgctxt "#10047" msgid "Try changing the setting level to see additional categories and settings." msgstr "" #empty strings from id 10048 to 10099 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10100" msgid "Yes/No dialogue" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10101" msgid "Progress dialogue" msgstr "" #empty strings from id 10102 to 10125 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10126" msgid "File browser" msgstr "" #empty string with id 10127 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10128" msgid "Network setup" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10129" msgid "Media source" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10130" msgid "Profile settings" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10131" msgid "Lock settings" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10132" msgid "Content settings" msgstr "" #empty string with id 10133 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10134" msgid "Favourites" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10135" msgid "Songs/Info" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10136" msgid "Smart playlist editor" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10137" msgid "Smart playlist rule editor" msgstr "" #empty string with id 10138 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10139" msgid "Pictures/Info" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10140" msgid "Add-on settings" msgstr "" #empty strings from id 10141 to 10145 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10146" msgid "Add-ons/Info" msgstr "" @@ -4535,32 +4535,32 @@ msgstr "" #empty strings from id 10215 to 10499 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10500" msgid "Music/Playlist" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10501" msgid "Music/Files" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10502" msgid "Music/Library" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#10503" msgid "Playlist editor" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp msgctxt "#10504" msgid "Top 100 songs" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp msgctxt "#10505" msgid "Top 100 albums" msgstr "" @@ -4615,22 +4615,22 @@ msgstr "" #empty strings from id 10525 to 11999 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12000" msgid "Select dialogue" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12001" msgid "Music/Info" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12002" msgid "Dialogue OK" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12003" msgid "Videos/Info" msgstr "" @@ -4639,25 +4639,25 @@ msgctxt "#12004" msgid "Scripts/Info" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12005" msgid "Fullscreen video" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12006" msgid "Audio visualisation" msgstr "" #empty string with id 12007 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12008" msgid "File stacking dialogue" msgstr "" #. Does not match window ID description -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12009" msgid "Rebuild index..." msgstr "" @@ -4759,7 +4759,7 @@ msgctxt "#12321" msgid "Ok" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp msgctxt "#12322" msgid "*" msgstr "" @@ -4771,7 +4771,7 @@ msgctxt "#12325" msgid "Locked! Enter code..." msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#12326" msgid "Enter password" msgstr "" @@ -4791,17 +4791,17 @@ msgctxt "#12329" msgid "or press C to cancel" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp msgctxt "#12330" msgid "Enter gamepad button combo and" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp msgctxt "#12331" msgid "press OK, or Back to cancel" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#12332" msgid "Set lock" msgstr "" @@ -4810,13 +4810,13 @@ msgctxt "#12333" msgid "Unlock" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#12334" msgid "Reset lock" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#12335" msgid "Remove lock" msgstr "" @@ -4838,30 +4838,30 @@ msgctxt "#12339" msgid "Full-text password" msgstr "" -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12340" msgid "Enter new password" msgstr "" -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12341" msgid "Re-Enter new password" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12342" msgid "Incorrect password," msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12343" msgid "retries left " msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12344" msgid "Passwords entered did not match." msgstr "" @@ -4886,51 +4886,51 @@ msgctxt "#12348" msgid "Item locked" msgstr "" -#: src/utils/EdenVideoArtUpdater.cpp +#: xbmc/utils/EdenVideoArtUpdater.cpp msgctxt "#12349" msgid "Updating video library art" msgstr "" -#: src/utils/EdenVideoArtUpdater.cpp +#: xbmc/utils/EdenVideoArtUpdater.cpp msgctxt "#12350" msgid "Processing %s" msgstr "" -#: src/video/windows/GUIWindowVideoBase.cpp +#: xbmc/video/windows/GUIWindowVideoBase.cpp msgctxt "#12351" msgid "The art cache in your video library needs updating." msgstr "" -#: src/video/windows/GUIWindowVideoBase.cpp +#: xbmc/video/windows/GUIWindowVideoBase.cpp msgctxt "#12352" msgid "No downloading is needed." msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#12353" msgid "Reactivate lock" msgstr "" -#: src/video/windows/GUIWindowVideoBase.cpp +#: xbmc/video/windows/GUIWindowVideoBase.cpp msgctxt "#12354" msgid "Would you like to update it now?" msgstr "" #empty string with id 12355 -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#12356" msgid "Change lock" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12357" msgid "Source lock" msgstr "" -#: src/dialogs/GUIDialogGamepad.cpp -#: src/dialogs/GUIDialogNumeric.cpp +#: xbmc/dialogs/GUIDialogGamepad.cpp +#: xbmc/dialogs/GUIDialogNumeric.cpp msgctxt "#12358" msgid "Password entry was blank. Try again." msgstr "" @@ -5017,7 +5017,7 @@ msgstr "" #empty strings from id 12387 to 12389 -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#12390" msgid "System uptime" msgstr "" @@ -5040,49 +5040,49 @@ msgctxt "#12393" msgid "Days" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#12394" msgid "Total uptime" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#12395" msgid "Battery level" msgstr "" #. Used on the button to toggle add-on update mode in the Add-on Manager. -#: src/addons/GUIWindowAddonBrowser.cpp +#: xbmc/addons/GUIWindowAddonBrowser.cpp msgctxt "#12396" msgid "Auto updates: On" msgstr "" #. Used on the button to toggle add-on update mode in the Add-on Manager. -#: src/addons/GUIWindowAddonBrowser.cpp +#: xbmc/addons/GUIWindowAddonBrowser.cpp msgctxt "#12397" msgid "Auto updates: Notify" msgstr "" #. Used on the button to toggle add-on update mode in the Add-on Manager. -#: src/addons/GUIWindowAddonBrowser.cpp +#: xbmc/addons/GUIWindowAddonBrowser.cpp msgctxt "#12398" msgid "Auto updates: Never" msgstr "" #empty strings from id 12399 to 12599 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12600" msgid "Weather" msgstr "" #empty strings from id 12601 to 12899 -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12900" msgid "Screensaver" msgstr "" -#: src/guilib/WindowIDs.h +#: xbmc/guilib/WindowIDs.h msgctxt "#12901" msgid "Fullscreen OSD" msgstr "" @@ -5217,52 +5217,52 @@ msgctxt "#13026" msgid "Try to wake remote servers on access" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13027" msgid "Wake on Lan (%s)" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13028" msgid "Waiting for network to connect..." msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13029" msgid "Failed to execute Wake on Lan!" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13030" msgid "Waiting for server to wake up..." msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13031" msgid "Extended wait for server to wake up..." msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13032" msgid "Waiting for services to launch..." msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13033" msgid "MAC Discovery" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13034" msgid "Updated for %s" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13035" msgid "Found for %s" msgstr "" -#: src/network/WakeOnAccess.cpp +#: xbmc/network/WakeOnAccess.cpp msgctxt "#13036" msgid "Failed for %s" msgstr "" @@ -5436,17 +5436,17 @@ msgstr "" #empty strings from id 13148 to 13158 -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13159" msgid "Subnet mask" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13160" msgid "Gateway" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13161" msgid "Primary DNS" msgstr "" @@ -5488,7 +5488,7 @@ msgstr "" #: skin.confluence #: skin.retouched #: xbmc\profiles\ProfilesManager.cpp -#: src/profiles/dialogs/GUIDialogProfileSettings.cpp +#: xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp msgctxt "#13200" msgid "Profiles" msgstr "" @@ -5505,7 +5505,7 @@ msgctxt "#13204" msgid "Last loaded profile:" msgstr "" -#: src/music/karaoke/GUIDialogKaraokeSongSelector.cpp +#: xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp msgctxt "#13205" msgid "Unknown" msgstr "" @@ -5574,7 +5574,7 @@ msgctxt "#13270" msgid "Hardware:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13271" msgid "CPU Usage:" msgstr "" @@ -5615,12 +5615,12 @@ msgstr "" #empty string with id 13282 -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13283" msgid "Operating system:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13284" msgid "CPU speed:" msgstr "" @@ -5631,7 +5631,7 @@ msgctxt "#13286" msgid "Video encoder:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13287" msgid "Screen resolution:" msgstr "" @@ -5648,7 +5648,7 @@ msgctxt "#13294" msgid "DVD region:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#13295" msgid "Internet:" msgstr "" @@ -5803,12 +5803,12 @@ msgctxt "#13331" msgid "Error: Out of memory" msgstr "" -#: src/dialogs/GUIDialogFavourites.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#13332" msgid "Move up" msgstr "" -#: src/dialogs/GUIDialogFavourites.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#13333" msgid "Move down" msgstr "" @@ -5817,7 +5817,7 @@ msgctxt "#13334" msgid "Edit label" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#13335" msgid "Make default" msgstr "" @@ -5984,8 +5984,8 @@ msgctxt "#13390" msgid "There are no settings available\nfor this visualisation" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/dialogs/GUIDialogPlayEject.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogPlayEject.cpp msgctxt "#13391" msgid "Eject/Load" msgstr "" @@ -5995,12 +5995,12 @@ msgctxt "#13392" msgid "Use visualisation if playing audio" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#13393" msgid "Calculate size" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#13394" msgid "Calculating folder size" msgstr "" @@ -6031,8 +6031,8 @@ msgctxt "#13400" msgid "Crossfade between songs on the same album" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp msgctxt "#13401" msgid "Browse for %s" msgstr "" @@ -6041,7 +6041,7 @@ msgctxt "#13402" msgid "Show track position" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#13403" msgid "Clear default" msgstr "" @@ -6067,7 +6067,7 @@ msgctxt "#13408" msgid "(IMDb user rating)" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#13409" msgid "Top 250" msgstr "" @@ -6084,7 +6084,7 @@ msgctxt "#13412" msgid "Play from here" msgstr "" -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#13413" msgid "Downloading" msgstr "" @@ -6100,28 +6100,28 @@ msgid "Render method" msgstr "" #: system/settings/settings.xml -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#13416" msgid "Auto detect" msgstr "" -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#13417" msgid "Basic shaders (ARB)" msgstr "" -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#13418" msgid "Advanced shaders (GLSL)" msgstr "" #: system/settings/settings.xml -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#13419" msgid "Software" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp msgctxt "#13420" msgid "Remove safely" msgstr "" @@ -6174,7 +6174,7 @@ msgid "Allow hardware acceleration (OpenMax)" msgstr "" #: system/settings/settings.xml -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#13431" msgid "Pixel Shaders" msgstr "" @@ -6190,7 +6190,7 @@ msgid "Play the next video automatically" msgstr "" #. If autoplay next video is set true -#: src/video/windows/GUIWindowVideoBase.cpp +#: xbmc/video/windows/GUIWindowVideoBase.cpp msgctxt "#13434" msgid "Play only this" msgstr "" @@ -6200,7 +6200,7 @@ msgctxt "#13435" msgid "Enable HQ Scalers for scalings above" msgstr "" -#: src/settings/GUISettings.cpp +#: xbmc/settings/GUISettings.cpp msgctxt "#13436" msgid "Allow hardware acceleration (libstagefright)" msgstr "" @@ -6381,32 +6381,32 @@ msgctxt "#13510" msgid "Sync playback to display" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13511" msgid "Choose art" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13512" msgid "Current art" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13513" msgid "Remote art" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13514" msgid "Local art" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13515" msgid "No art" msgstr "" -#: src/video/dialogs/GUIDialogVideoInfo.cpp +#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp msgctxt "#13516" msgid "Add art" msgstr "" @@ -6687,7 +6687,7 @@ msgid "%i ms" msgstr "" #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#14047" msgid "%i %%" msgstr "" @@ -6719,7 +6719,7 @@ msgctxt "#14053" msgid "GUI filters" msgstr "" -#: src/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +#: xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp msgctxt "#14054" msgid "%2.1f dB" msgstr "" @@ -6805,14 +6805,14 @@ msgctxt "#14075" msgid "Use daylight saving time" msgstr "" -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#14076" msgid "Add to favourites" msgstr "" -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#14077" msgid "Remove from favourites" msgstr "" @@ -6922,7 +6922,7 @@ msgctxt "#14099" msgid "Eject disc when CD ripping is complete" msgstr "" -#: src/music/windows/GUIWindowMusicSongs.cpp +#: xbmc/music/windows/GUIWindowMusicSongs.cpp msgctxt "#14100" msgid "Stop ripping CD" msgstr "" @@ -6953,23 +6953,23 @@ msgstr "" #empty strings from id 14105 to 15011 -#: src/video/VideoDatabase.cpp +#: xbmc/video/VideoDatabase.cpp msgctxt "#15012" msgid "Unavailable source" msgstr "" -#: src/video/VideoDatabase.cpp +#: xbmc/video/VideoDatabase.cpp msgctxt "#15013" msgid "What would you like to do with media items from %s" msgstr "" -#: src/video/VideoDatabase.cpp +#: xbmc/video/VideoDatabase.cpp msgctxt "#15014" msgid "Keep" msgstr "" -#: src/dialogs/GUIDialogFavourites.cpp -#: src/video/VideoDatabase.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp +#: xbmc/video/VideoDatabase.cpp msgctxt "#15015" msgid "Remove" msgstr "" @@ -7000,28 +7000,28 @@ msgctxt "#15101" msgid "Database" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeCompilations.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyAdded.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyPlayed.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeCompilations.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyAdded.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRcentlyPlayed.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp msgctxt "#15102" msgid "* All albums" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp -#: src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp msgctxt "#15103" msgid "* All artists" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp msgctxt "#15104" msgid "* All songs" msgstr "" -#: src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp +#: xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp msgctxt "#15105" msgid "* All genres" msgstr "" @@ -7063,19 +7063,19 @@ msgstr "" #empty strings from id 15201 to 15206 -#: src/GUIInfoManager.cpp +#: xbmc/GUIInfoManager.cpp msgctxt "#15207" msgid "Connected" msgstr "" -#: src/GUIInfoManager.cpp +#: xbmc/GUIInfoManager.cpp msgctxt "#15208" msgid "Not connected" msgstr "" #empty strings from id 15209 to 15212 -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#15213" msgid "Play using..." msgstr "" @@ -7094,14 +7094,14 @@ msgstr "" #empty strings from id 15217 to 15299 -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#15300" msgid "Path not found or invalid" msgstr "" -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#15301" msgid "Could not connect to network server" msgstr "" @@ -7110,8 +7110,8 @@ msgctxt "#15302" msgid "No servers found" msgstr "" -#: src/windows/GUIMediaWindow.cpp -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIMediaWindow.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#15303" msgid "Workgroup not found" msgstr "" @@ -7149,7 +7149,7 @@ msgstr "" #empty strings from id 16005 to 16007 -#: src/dialogs/GUIDialogFavourites.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#16008" msgid "Enter new title" msgstr "" @@ -7166,17 +7166,17 @@ msgctxt "#16011" msgid "Enter the album name" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#16012" msgid "Enter the playlist name" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#16013" msgid "Enter new filename" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16014" msgid "Enter folder name" msgstr "" @@ -7189,40 +7189,40 @@ msgctxt "#16016" msgid "Available options: %A, %T, %N, %B, %D, %G, %Y, %F, %S" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#16017" msgid "Enter search string" msgstr "" #: system/settings/settings.xml -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#16018" msgid "None" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16019" msgid "Auto select" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16020" msgid "De-interlace" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16021" msgid "Bob" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16022" msgid "Bob (inverted)" msgstr "" #empty string with id 16023 -#: src/dialogs/GUIDialogProgress.cpp +#: xbmc/dialogs/GUIDialogProgress.cpp msgctxt "#16024" msgid "Cancelling..." msgstr "" @@ -7267,12 +7267,12 @@ msgctxt "#16034" msgid "Could not get songs from database." msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#16035" msgid "Party mode playlist" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16036" msgid "De-interlace (Half)" msgstr "" @@ -7281,22 +7281,22 @@ msgctxt "#16037" msgid "Deinterlace video" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16038" msgid "Deinterlace method" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16039" msgid "Off" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16040" msgid "Auto" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16041" msgid "On" msgstr "" @@ -7337,189 +7337,189 @@ msgstr "" #empty strings from id 16108 to 16199 -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16200" msgid "Operation was aborted" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16201" msgid "Copy failed" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16202" msgid "Failed to copy at least one file" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16203" msgid "Move failed" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16204" msgid "Failed to move at least one file" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16205" msgid "Delete failed" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#16206" msgid "Failed to delete at least one file" msgstr "" #empty strings from id 16207 to 16299 -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16300" msgid "Video scaling method" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16301" msgid "Nearest neighbour" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16302" msgid "Bilinear" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16303" msgid "Bicubic" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16304" msgid "Lanczos2" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16305" msgid "Lanczos3" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16306" msgid "Sinc8" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16307" msgid "Bicubic (software)" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16308" msgid "Lanczos (software)" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16309" msgid "Sinc (software)" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16310" msgid "Temporal" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16311" msgid "Temporal/Spatial" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16312" msgid "(VDPAU)Noise Reduction" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16313" msgid "(VDPAU)Sharpness" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16314" msgid "Inverse Telecine" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16315" msgid "Lanczos3 optimised" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16316" msgid "Auto" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16317" msgid "Temporal (Half)" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16318" msgid "Temporal/Spatial (Half)" msgstr "" -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#16319" msgid "DXVA" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16320" msgid "DXVA Bob" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16321" msgid "DXVA Best" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16322" msgid "Spline36" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16323" msgid "Spline36 optimised" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16324" msgid "Software Blend" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16325" msgid "VDPAU - Bob" msgstr "" -#: src/cores/VideoRenderers/BaseRenderer.cpp +#: xbmc/cores/VideoRenderers/BaseRenderer.cpp msgctxt "#16326" msgid "DXVA-HD" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16327" msgid "VAAPI Bob" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16328" msgid "VAAPI Motion Adaptive" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16329" msgid "VAAPI Motion Compensated" msgstr "" @@ -7550,7 +7550,7 @@ msgstr "" #empty strings from id 16334 to 16399 -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#16400" msgid "Post-processing" msgstr "" @@ -7594,15 +7594,15 @@ msgstr "" #. Label of the button / context menu entry to find similar programs in the PVR EPG data #: skin.confluence -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/windows/GUIWindowPVRGuide.cpp -#: src/pvr/windows/GUIWindowPVRRecordings.cpp -#: src/pvr/windows/GUIWindowPVRTimers.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/windows/GUIWindowPVRGuide.cpp +#: xbmc/pvr/windows/GUIWindowPVRRecordings.cpp +#: xbmc/pvr/windows/GUIWindowPVRTimers.cpp msgctxt "#19003" msgid "Find similar" msgstr "" -#: src/epg/EpgContainer.cpp +#: xbmc/epg/EpgContainer.cpp msgctxt "#19004" msgid "Importing EPG from clients" msgstr "" @@ -7635,7 +7635,7 @@ msgctxt "#19011" msgid "UNC" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19012" msgid "PVR Backend" msgstr "" @@ -7656,7 +7656,7 @@ msgctxt "#19016" msgid "PVR Backend %i - %s" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#19017" msgid "Recordings" msgstr "" @@ -7667,7 +7667,7 @@ msgctxt "#19018" msgid "Folder with channel icons" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp #: skin.confluence msgctxt "#19019" msgid "Channels" @@ -7693,7 +7693,7 @@ msgctxt "#19024" msgid "Radio channels" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19025" msgid "Upcoming recordings" msgstr "" @@ -7817,7 +7817,7 @@ msgctxt "#19054" msgid "Hide channel" msgstr "" -#: src/epg/EpgInfoTag.cpp +#: xbmc/epg/EpgInfoTag.cpp msgctxt "#19055" msgid "No information available" msgstr "" @@ -7861,8 +7861,8 @@ msgstr "" #empty string with id 19065 #. Name of a shortcut to a custom folder for channel icons -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp msgctxt "#19066" msgid "Channel icons" msgstr "" @@ -7998,17 +7998,17 @@ msgctxt "#19098" msgid "Warning" msgstr "" -#: src/pvr/PVRGUIInfo.cpp +#: xbmc/pvr/PVRGUIInfo.cpp msgctxt "#19099" msgid "Service" msgstr "" -#: src/pvr/PVRGUIInfo.cpp +#: xbmc/pvr/PVRGUIInfo.cpp msgctxt "#19100" msgid "Mux" msgstr "" -#: src/pvr/PVRGUIInfo.cpp +#: xbmc/pvr/PVRGUIInfo.cpp msgctxt "#19101" msgid "Provider" msgstr "" @@ -8018,7 +8018,7 @@ msgid "Please switch to another channel." msgstr "" #. Title of numeric dialog for choosing a channel by entering a number -#: src/pvr/windows/GUIWindowPVRCommon.cpp +#: xbmc/pvr/windows/GUIWindowPVRCommon.cpp msgctxt "#19103" msgid "Go to channel" msgstr "" @@ -8061,17 +8061,17 @@ msgctxt "#19113" msgid "Delete all recordings in this folder?" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19114" msgid "Version" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19115" msgid "Address" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19116" msgid "Disksize" msgstr "" @@ -8089,7 +8089,7 @@ msgctxt "#19119" msgid "On which server do you want to search?" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19120" msgid "Client number" msgstr "" @@ -8170,7 +8170,7 @@ msgctxt "#19139" msgid "Name of the new group" msgstr "" -#: src/pvr/windows/GUIWindowPVRSearch.cpp +#: xbmc/pvr/windows/GUIWindowPVRSearch.cpp msgctxt "#19140" msgid "Search..." msgstr "" @@ -8261,7 +8261,7 @@ msgctxt "#19162" msgid "Recording active" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19163" msgid "Recordings" msgstr "" @@ -8274,7 +8274,7 @@ msgctxt "#19165" msgid "Switch" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#19166" msgid "PVR information" msgstr "" @@ -8411,12 +8411,12 @@ msgctxt "#19196" msgid "PVR client specific actions" msgstr "" -#: src/addons/addoncallbackspvr.cpp +#: xbmc/addons/addoncallbackspvr.cpp msgctxt "#19197" msgid "Recording started on: %s" msgstr "" -#: src/addons/addoncallbackspvr.cpp +#: xbmc/addons/addoncallbackspvr.cpp msgctxt "#19198" msgid "Recording finished on: %s" msgstr "" @@ -8636,7 +8636,7 @@ msgctxt "#19249" msgid "Filter channels" msgstr "" -#: src/epg/EpgContainer.cpp +#: xbmc/epg/EpgContainer.cpp msgctxt "#19250" msgid "Loading EPG from database" msgstr "" @@ -8704,7 +8704,7 @@ msgctxt "#19265" msgid "The entered PIN number was incorrect." msgstr "" -#: src/epg/EpgInfoTag.cpp +#: xbmc/epg/EpgInfoTag.cpp msgctxt "#19266" msgid "Parental locked" msgstr "" @@ -8745,22 +8745,22 @@ msgctxt "#19274" msgid "Please visit http://kodi.wiki/view/PVR to learn more." msgstr "" -#: src/pvr/timers/PVRTimerInfoTag.cpp +#: xbmc/pvr/timers/PVRTimerInfoTag.cpp msgctxt "#19275" msgid "Conflict warning" msgstr "" -#: src/pvr/timers/PVRTimerInfoTag.cpp +#: xbmc/pvr/timers/PVRTimerInfoTag.cpp msgctxt "#19276" msgid "Conflict error" msgstr "" -#: src/pvr/timers/PVRTimerInfoTag.cpp +#: xbmc/pvr/timers/PVRTimerInfoTag.cpp msgctxt "#19277" msgid "Recording conflict" msgstr "" -#: src/pvr/timers/PVRTimerInfoTag.cpp +#: xbmc/pvr/timers/PVRTimerInfoTag.cpp msgctxt "#19278" msgid "Recording error" msgstr "" @@ -8781,41 +8781,41 @@ msgid "Confirm channel switches by pressing OK" msgstr "" #. Label for a select option or list item, representing an icon graphic (like a TV channel icon) -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp msgctxt "#19282" msgid "Current icon" msgstr "" #. Label for a select option or list item, representing an icon graphic (like a TV channel icon) -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp msgctxt "#19283" msgid "No icon" msgstr "" #. Label for a select/menu option to select an icon graphic -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp msgctxt "#19284" msgid "Choose icon" msgstr "" #. Label for a select/menu option to select an icon graphic -#: src/pvr/windows/GUIWindowPVRChannels.cpp -#: src/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp +#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp msgctxt "#19285" msgid "Browse for icon" msgstr "" #. Notification message if process starts searching for missing channel icons -#: src/pvr/PVRManager.cpp +#: xbmc/pvr/PVRManager.cpp msgctxt "#19286" msgid "Searching for channel icons" msgstr "" #. Label for the default pvr channel group -#: src/pvr/windows/GUIWindowPVRCommon.cpp +#: xbmc/pvr/windows/GUIWindowPVRCommon.cpp msgctxt "#19287" msgid "All channels" msgstr "" @@ -8827,195 +8827,195 @@ msgstr "" #empty strings from id 19289 to 19498 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19499" msgid "Other/Unknown" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19500" msgid "Movie/Drama" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19501" msgid "Detective/Thriller" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19502" msgid "Adventure/Western/War" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19503" msgid "Science Fiction/Fantasy/Horror" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19504" msgid "Comedy" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19505" msgid "Soap/Melodrama/Folkloric" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19506" msgid "Romance" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19507" msgid "Serious/Classical/Religious/Historical Movie/Drama" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19508" msgid "Adult Movie/Drama" msgstr "" #empty strings from id 19509 to 19515 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19516" msgid "News/Current Affairs" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19517" msgid "News/Weather Report" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19518" msgid "News Magazine" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19519" msgid "Documentary" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19520" msgid "Discussion/Interview/Debate" msgstr "" #empty strings from id 19521 to 19531 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19532" msgid "Show/Game Show" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19533" msgid "Game Show/Quiz/Contest" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19534" msgid "Variety Show" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19535" msgid "Talk Show" msgstr "" #empty strings from id 19536 to 19547 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19548" msgid "Sports" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19549" msgid "Special Event" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19550" msgid "Sport Magazine" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19551" msgid "Football" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19552" msgid "Tennis/Squash" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19553" msgid "Team Sports" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19554" msgid "Athletics" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19555" msgid "Motor Sport" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19556" msgid "Water Sport" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19557" msgid "Winter Sports" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19558" msgid "Equestrian" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19559" msgid "Martial Sports" msgstr "" #empty strings from id 19560 to 19563 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19564" msgid "Children's/Youth Programmes" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19565" msgid "Pre-school Children's Programmes" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19566" msgid "Entertainment Programmes for 6 to 14" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19567" msgid "Entertainment Programmes for 10 to 16" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19568" msgid "Informational/Educational/School Programme" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19569" msgid "Cartoons/Puppets" msgstr "" @@ -9026,269 +9026,269 @@ msgctxt "#19580" msgid "Music/Ballet/Dance" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19581" msgid "Rock/Pop" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19582" msgid "Serious/Classical Music" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19583" msgid "Folk/Traditional Music" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19584" msgid "Musical/Opera" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19585" msgid "Ballet" msgstr "" #empty strings from id 19586 to 19595 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19596" msgid "Arts/Culture" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19597" msgid "Performing Arts" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19598" msgid "Fine Arts" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19599" msgid "Religion" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19600" msgid "Popular Culture/Traditional Arts" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19601" msgid "Literature" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19602" msgid "Film/Cinema" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19603" msgid "Experimental Film/Video" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19604" msgid "Broadcasting/Press" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19605" msgid "New Media" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19606" msgid "Arts/Culture Magazines" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19607" msgid "Fashion" msgstr "" #empty strings from id 19608 to 19611 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19612" msgid "Social/Political/Economics" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19613" msgid "Magazines/Reports/Documentary" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19614" msgid "Economics/Social Advisory" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19615" msgid "Remarkable People" msgstr "" #empty strings from id 19616 to 19627 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19628" msgid "Education/Science/Factual" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19629" msgid "Nature/Animals/Environment" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19630" msgid "Technology/Natural Sciences" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19631" msgid "Medicine/Physiology/Psychology" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19632" msgid "Foreign Countries/Expeditions" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19633" msgid "Social/Spiritual Sciences" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19634" msgid "Further Education" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19635" msgid "Languages" msgstr "" #empty strings from id 19636 to 19643 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19644" msgid "Leisure/Hobbies" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19645" msgid "Tourism/Travel" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19646" msgid "Handicraft" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19647" msgid "Motoring" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19648" msgid "Fitness & Health" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19649" msgid "Cooking" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19650" msgid "Advertisement/Shopping" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19651" msgid "Gardening" msgstr "" #empty strings from id 19652 to 19659 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19660" msgid "Special Characteristics" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19661" msgid "Original Language" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19662" msgid "Black & White" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19663" msgid "Unpublished" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19664" msgid "Live Broadcast" msgstr "" #empty strings from id 19665 to 19675 -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19676" msgid "Drama" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19677" msgid "Detective/Thriller" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19678" msgid "Adventure/Western/War" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19679" msgid "Science Fiction/Fantasy/Horror" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19680" msgid "Comedy" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19681" msgid "Soap/Melodrama/Folkloric" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19682" msgid "Romance" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19683" msgid "Serious/ClassicalReligion/Historical" msgstr "" -#: src/epg/Epg.cpp +#: xbmc/epg/Epg.cpp msgctxt "#19684" msgid "Adult" msgstr "" @@ -9328,7 +9328,7 @@ msgctxt "#20007" msgid "Recordings" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20008" msgid "Screenshots" msgstr "" @@ -9339,12 +9339,12 @@ msgstr "" #empty string with id 20010 -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20011" msgid "Music playlists" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20012" msgid "Video playlists" msgstr "" @@ -9357,34 +9357,34 @@ msgctxt "#20014" msgid "Sort by: Playlist" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20015" msgid "Remote thumb" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/music/dialogs/GUIDialogSongInfo.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogSongInfo.cpp msgctxt "#20016" msgid "Current thumb" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/music/dialogs/GUIDialogSongInfo.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogSongInfo.cpp msgctxt "#20017" msgid "Local thumb" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/music/dialogs/GUIDialogSongInfo.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogSongInfo.cpp msgctxt "#20018" msgid "No thumb" msgstr "" -#: src/dialogs/GUIDialogContextMenu.cpp -#: src/dialogs/GUIDialogFavourites.cpp +#: xbmc/dialogs/GUIDialogContextMenu.cpp +#: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#20019" msgid "Choose thumbnail" msgstr "" @@ -9530,22 +9530,22 @@ msgctxt "#20066" msgid "Lock preferences" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20067" msgid "Edit profile" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20068" msgid "Profile lock" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20069" msgid "Could not create folder" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#20070" msgid "Profile directory" msgstr "" @@ -9554,22 +9554,22 @@ msgctxt "#20071" msgid "Start with fresh media sources" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20072" msgid "Make sure the selected folder is writable" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20073" msgid "and that the new folder name is valid" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20074" msgid "MPAA rating" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20075" msgid "Enter master lock code" msgstr "" @@ -9704,7 +9704,7 @@ msgctxt "#20107" msgid "Separate (locked)" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#20108" msgid "Root" msgstr "" @@ -9722,22 +9722,22 @@ msgctxt "#20111" msgid "Autostart UPnP client" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20112" msgid "Last login: %s" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20113" msgid "Never logged on" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20114" msgid "Profile %i / %i" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20115" msgid "User login / Select a profile" msgstr "" @@ -9746,7 +9746,7 @@ msgctxt "#20116" msgid "Use lock on login screen" msgstr "" -#: src/windows/GUIWindowLoginScreen.cpp +#: xbmc/windows/GUIWindowLoginScreen.cpp msgctxt "#20117" msgid "Invalid lock code." msgstr "" @@ -9767,7 +9767,7 @@ msgctxt "#20121" msgid "Party on!" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20122" msgid "True" msgstr "" @@ -9790,22 +9790,22 @@ msgstr "" #empty string with id 20127 -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#20128" msgid "Go to root" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#20129" msgid "Weave" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#20130" msgid "Weave (inverted)" msgstr "" -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#20131" msgid "Blend" msgstr "" @@ -9814,12 +9814,12 @@ msgctxt "#20132" msgid "Restart video" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20133" msgid "Edit network location" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20134" msgid "Remove network location" msgstr "" @@ -9848,7 +9848,7 @@ msgctxt "#20140" msgid "Lock screensaver" msgstr "" -#: src/media/MediaTypes.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20141" msgid "Set" msgstr "" @@ -9897,17 +9897,17 @@ msgctxt "#20152" msgid "Lock preferences for %s" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#20153" msgid "Browse..." msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20154" msgid "Summary information" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20155" msgid "Storage information" msgstr "" @@ -9920,17 +9920,17 @@ msgctxt "#20157" msgid "DVD-ROM information" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20158" msgid "Network information" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20159" msgid "Video information" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20160" msgid "Hardware information" msgstr "" @@ -9975,7 +9975,7 @@ msgctxt "#20170" msgid "Line" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20171" msgid "Windows network (SMB)" msgstr "" @@ -9984,17 +9984,17 @@ msgctxt "#20172" msgid "XBMSP server" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20173" msgid "FTP server" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20174" msgid "iTunes music share (DAAP)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20175" msgid "UPnP server" msgstr "" @@ -10049,7 +10049,7 @@ msgctxt "#20187" msgid "UPnP" msgstr "" -#: src/network/upnp/UPnPServer.cpp +#: xbmc/network/upnp/UPnPServer.cpp #: system/settings/settings.xml msgctxt "#20188" msgid "Announce library updates via UPnP" @@ -10121,22 +10121,22 @@ msgstr "" #empty strings from id 20222 to 20239 -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20240" msgid "Android music" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20241" msgid "Android videos" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20242" msgid "Android pictures" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#20243" msgid "Android photos" msgstr "" @@ -10159,12 +10159,12 @@ msgctxt "#20252" msgid "Filling glasses (videos)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20253" msgid "WebDAV server (HTTP)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20254" msgid "WebDAV server (HTTPS)" msgstr "" @@ -10173,32 +10173,32 @@ msgctxt "#20255" msgid "First logon, edit your profile" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20256" msgid "HTS Tvheadend client" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20257" msgid "VDR Streamdev client" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20258" msgid "MythTV client" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20259" msgid "Network Filesystem (NFS)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20260" msgid "Secure Shell (SSH/SFTP)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20261" msgid "Apple Filing Protocol (AFP)" msgstr "" @@ -10210,12 +10210,12 @@ msgstr "" #empty strings from id 20263 to 20299 -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20300" msgid "Web server directory (HTTP)" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20301" msgid "Web server directory (HTTPS)" msgstr "" @@ -10228,14 +10228,14 @@ msgctxt "#20303" msgid "Do you want to skip and proceed?" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#20304" msgid "RSS Feed" msgstr "" #empty strings from id 20305 to 20306 -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#20307" msgid "Secondary DNS" msgstr "" @@ -10244,7 +10244,7 @@ msgctxt "#20308" msgid "DHCP server:" msgstr "" -#: src/windows/GUIWindowFileManager.cpp +#: xbmc/windows/GUIWindowFileManager.cpp msgctxt "#20309" msgid "Make new folder" msgstr "" @@ -10289,7 +10289,7 @@ msgstr "" #empty string with id 20322 -#: src/video/windows/GUIWindowVideoNav.cpp +#: xbmc/video/windows/GUIWindowVideoNav.cpp msgctxt "#20323" msgid "Movie plot" msgstr "" @@ -10346,21 +10346,21 @@ msgctxt "#20336" msgid "Unlock sources" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20337" msgid "Actor" msgstr "" -#: src/media/MediaTypes.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20338" msgid "Movie" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20339" msgid "Director" msgstr "" @@ -10373,17 +10373,17 @@ msgctxt "#20341" msgid "this path from the Kodi library?" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20342" msgid "Movies" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#20343" msgid "TV shows" msgstr "" @@ -10404,9 +10404,9 @@ msgctxt "#20347" msgid "as" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20348" msgid "Directors" msgstr "" @@ -10447,22 +10447,22 @@ msgctxt "#20357" msgid "Enter the TV show name" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp msgctxt "#20358" msgid "Season %i" msgstr "" -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20359" msgid "Episode" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20360" msgid "Episodes" msgstr "" @@ -10479,7 +10479,7 @@ msgctxt "#20363" msgid "Remove TV show from library" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20364" msgid "TV show" msgstr "" @@ -10488,8 +10488,8 @@ msgctxt "#20365" msgid "Episode plot" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp msgctxt "#20366" msgid "* All seasons" msgstr "" @@ -10519,8 +10519,8 @@ msgctxt "#20372" msgid "Season image" msgstr "" -#: src/media/MediaTypes.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/media/MediaTypes.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20373" msgid "Season" msgstr "" @@ -10553,7 +10553,7 @@ msgctxt "#20380" msgid "Exclude selected folder from scans" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp msgctxt "#20381" msgid "Specials" msgstr "" @@ -10572,39 +10572,39 @@ msgctxt "#20385" msgid "Remove link to TV show" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#20386" msgid "Recently added movies" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#20387" msgid "Recently added episodes" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20388" msgid "Studios" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20389" msgid "Music videos" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp msgctxt "#20390" msgid "Recently added music videos" msgstr "" -#: src/media/MediaTypes.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20391" msgid "Music video" msgstr "" @@ -10621,7 +10621,7 @@ msgctxt "#20394" msgid "Loading music video information" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#20395" msgid "Mixed" msgstr "" @@ -10659,7 +10659,7 @@ msgctxt "#20403" msgid "Set actor thumb" msgstr "" -#: src/video/dialogs/GUIDialogVideoBookmarks.cpp +#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp msgctxt "#20404" msgid "Remove bookmark" msgstr "" @@ -10709,19 +10709,19 @@ msgctxt "#20415" msgid "Scanning for new content" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20416" msgid "First aired" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20417" msgid "Writer" msgstr "" -#: src/playlists/SmartPlayList.cpp +#: xbmc/playlists/SmartPlayList.cpp msgctxt "#20418" msgid "Writers" msgstr "" @@ -10746,12 +10746,12 @@ msgctxt "#20422" msgid "Always" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20423" msgid "Has trailer" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20424" msgid "False" msgstr "" @@ -10793,9 +10793,9 @@ msgctxt "#20433" msgid "Extract thumbnails and video information" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/media/MediaTypes.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#20434" msgid "Sets" msgstr "" @@ -10809,27 +10809,27 @@ msgctxt "#20436" msgid "Export actor thumbs?" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20437" msgid "Choose fanart" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20438" msgid "Local fanart" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20439" msgid "No fanart" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20440" msgid "Current fanart" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20441" msgid "Remote fanart" msgstr "" @@ -10846,7 +10846,7 @@ msgctxt "#20444" msgid "items within this path?" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#20445" msgid "Fanart" msgstr "" @@ -10871,8 +10871,8 @@ msgctxt "#20450" msgid "Would you like to continue scanning?" msgstr "" -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20451" msgid "Countries" msgstr "" @@ -10898,7 +10898,7 @@ msgctxt "#20456" msgid "Flatten library hierarchy" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20457" msgid "Movie set" msgstr "" @@ -10908,12 +10908,12 @@ msgctxt "#20458" msgid "Group movies in sets" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp -#: src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp +#: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowOverview.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#20459" msgid "Tags" msgstr "" @@ -10966,7 +10966,7 @@ msgctxt "#21330" msgid "Show hidden files and directories" msgstr "" -#: src/network/GUIDialogNetworkSetup.cpp +#: xbmc/network/GUIDialogNetworkSetup.cpp msgctxt "#21331" msgid "TuxBox client" msgstr "" @@ -10987,7 +10987,7 @@ msgctxt "#21335" msgid "Are you sure to start the stream?" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#21336" msgid "Connecting to: %s" msgstr "" @@ -10999,7 +10999,7 @@ msgstr "" #empty strings from id 21338 to 21358 #up to 21355 is reserved for the TuxBox Client!! ! -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#21359" msgid "Add media share..." msgstr "" @@ -11013,22 +11013,22 @@ msgctxt "#21361" msgid "Look for remote UPnP players" msgstr "" -#: src/video/dialogs/GUIDialogVideoBookmarks.cpp +#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp msgctxt "#21362" msgid "Bookmark created" msgstr "" -#: src/video/dialogs/GUIDialogVideoBookmarks.cpp +#: xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp msgctxt "#21363" msgid "Episode Bookmark created" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#21364" msgid "Edit media share" msgstr "" -#: src/dialogs/GUIDialogFileBrowser.cpp +#: xbmc/dialogs/GUIDialogFileBrowser.cpp msgctxt "#21365" msgid "Remove media share" msgstr "" @@ -11175,62 +11175,62 @@ msgctxt "#21399" msgid "Use tween animations" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21400" msgid "contains" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21401" msgid "does not contain" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21402" msgid "is" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21403" msgid "is not" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21404" msgid "starts with" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21405" msgid "ends with" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21406" msgid "greater than" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21407" msgid "less than" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21408" msgid "after" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21409" msgid "before" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21410" msgid "in the last" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21411" msgid "not in the last" msgstr "" @@ -11269,7 +11269,7 @@ msgctxt "#21419" msgid "No scrapers present" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistRule.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp msgctxt "#21420" msgid "Value to match" msgstr "" @@ -11282,7 +11282,7 @@ msgctxt "#21422" msgid "Match items where" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#21423" msgid "New rule..." msgstr "" @@ -11291,12 +11291,12 @@ msgctxt "#21424" msgid "Items must match" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#21425" msgid "all of the rules" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#21426" msgid "one or more of the rules" msgstr "" @@ -11305,7 +11305,7 @@ msgctxt "#21427" msgid "Limit to" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#21428" msgid "No limit" msgstr "" @@ -11338,7 +11338,7 @@ msgctxt "#21435" msgid "Edit" msgstr "" -#: src/dialogs/GUIDialogSmartPlaylistEditor.cpp +#: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp msgctxt "#21436" msgid "%i items" msgstr "" @@ -11367,32 +11367,32 @@ msgctxt "#21442" msgid "Episode title" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21443" msgid "Video resolution" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21444" msgid "Audio channels" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21445" msgid "Video codec" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21446" msgid "Audio codec" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21447" msgid "Audio language" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21448" msgid "Subtitle language" msgstr "" @@ -11411,8 +11411,8 @@ msgctxt "#21451" msgid "Internet connection required." msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#21452" msgid "Get More..." msgstr "" @@ -11429,12 +11429,12 @@ msgctxt "#21455" msgid "Cache filled before reaching required amount for continous playback" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21456" msgid "External storage" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21457" msgid "Watched episode count" msgstr "" @@ -11480,33 +11480,33 @@ msgstr "" #empty string with id 21466 #. Filter (media data) from float value to float value -#: src/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp msgctxt "#21467" msgid "%.1f to %.1f" msgstr "" #. Filter (media data) from int value to int value -#: src/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp msgctxt "#21468" msgid "%d to %d" msgstr "" #. Filter (media data) from string value to string value -#: src/dialogs/GUIDialogMediaFilter.cpp -#: src/settings/SettingControl.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/settings/SettingControl.cpp msgctxt "#21469" msgid "%s to %s" msgstr "" #. Field (e.g. "Genre") [count] -#: src/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp msgctxt "#21470" msgid "%s [%d]" msgstr "" #empty strings from id 21471 to 21601 -#: src/Util.cpp +#: xbmc/Util.cpp msgctxt "#21602" msgid "(External)" msgstr "" @@ -11755,7 +11755,7 @@ msgctxt "#21882" msgid "Attempt to skip introduction before DVD menu" msgstr "" -#: src/dialogs/GUIDialogMediaSource.cpp +#: xbmc/dialogs/GUIDialogMediaSource.cpp msgctxt "#21883" msgid "Saved music" msgstr "" @@ -11772,18 +11772,18 @@ msgctxt "#21886" msgid "Downloading artist information" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp -#: src/playlists/SmartPlaylist.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21887" msgid "Biography" msgstr "" -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#21888" msgid "Discography" msgstr "" -#: src/dialogs/GUIDialogMediaFilter.cpp +#: xbmc/dialogs/GUIDialogMediaFilter.cpp msgctxt "#21889" msgid "Searching artist" msgstr "" @@ -11796,32 +11796,32 @@ msgctxt "#21891" msgid "Artist information" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21892" msgid "Instruments" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21893" msgid "Born" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21894" msgid "Formed" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21895" msgid "Themes" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21896" msgid "Disbanded" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21897" msgid "Died" msgstr "" @@ -11830,7 +11830,7 @@ msgctxt "#21898" msgid "Years active" msgstr "" -#: src/playlists/SmartPlaylist.cpp +#: xbmc/playlists/SmartPlaylist.cpp msgctxt "#21899" msgid "Label" msgstr "" @@ -11873,7 +11873,7 @@ msgctxt "#22006" msgid "Subtitle offset" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22007" msgid "OpenGL vendor:" msgstr "" @@ -11882,22 +11882,22 @@ msgctxt "#22008" msgid "OpenGL renderer:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22009" msgid "OpenGL version:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22010" msgid "GPU temperature:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22011" msgid "CPU temperature:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22012" msgid "Total memory" msgstr "" @@ -11933,7 +11933,7 @@ msgstr "" #. Electronic program guide, used as label in the menu of the PVR section and the MythDirectory #: addons/skin/confluence -#: src/filesystem/MythDirectory.cpp +#: xbmc/filesystem/MythDirectory.cpp msgctxt "#22020" msgid "Guide" msgstr "" @@ -11948,12 +11948,12 @@ msgctxt "#22022" msgid "Show video files in listings" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22023" msgid "DirectX vendor:" msgstr "" -#: src/windows/GUIWindowSystemInfo.cpp +#: xbmc/windows/GUIWindowSystemInfo.cpp msgctxt "#22024" msgid "Direct3D version:" msgstr "" @@ -12102,12 +12102,12 @@ msgstr "" #empty strings from id 23105 to 23999 #strings 24000 thru 24299 reserved for the Add-ons framework -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24000" msgid "Add-on" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24001" msgid "Add-ons" msgstr "" @@ -12122,74 +12122,74 @@ msgstr "" #empty string with id 24004 -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24005" msgid "Media sources" msgstr "" #empty string with id 24006 -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24007" msgid "Movie information" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24008" msgid "Screensaver" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24009" msgid "Script" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24010" msgid "Visualisation" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24011" msgid "Add-on repository" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24012" msgid "Subtitles" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24013" msgid "Lyrics" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24014" msgid "TV information" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24015" msgid "Music video information" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24016" msgid "Album information" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24017" msgid "Artist information" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24018" msgid "Services" msgstr "" -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24019" msgid "PVR clients" msgstr "" @@ -12207,20 +12207,20 @@ msgid "Enable" msgstr "" #. Defines the state of the add-on in the add-on manager window -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24023" msgid "Disabled" msgstr "" #. Used as an error message (triggered from content dialog) on disabled scrapers -#: src/settings/dialogs/GUIDialogContentSettings.cpp +#: xbmc/settings/dialogs/GUIDialogContentSettings.cpp msgctxt "#24024" msgid "Add-on disabled" msgstr "" #empty strings from id 24025 to 24026 -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24027" msgid "Weather" msgstr "" @@ -12242,13 +12242,13 @@ msgctxt "#24031" msgid "Error loading settings" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24032" msgid "All Add-ons" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24033" msgid "Get Add-ons" msgstr "" @@ -12273,45 +12273,45 @@ msgctxt "#24038" msgid "Install" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24039" msgid "Disabled Add-ons" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24040" msgid "(Clear the current setting)" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24041" msgid "Install from zip file" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24042" msgid "Downloading %i%%" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24043" msgid "Available Updates" msgstr "" -#: src/addons/AddonInstaller.cpp -#: src/addons/AddonsDatabase.cpp +#: xbmc/addons/AddonInstaller.cpp +#: xbmc/addons/AddonsDatabase.cpp msgctxt "#24044" msgid "Dependencies not met. Please contact Add-on author." msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24045" msgid "Add-on does not have the correct structure" msgstr "" -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#24046" msgid "%s is used by the following installed Add-on(s)" msgstr "" @@ -12326,7 +12326,7 @@ msgctxt "#24048" msgid "Rollback" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24049" msgid "Incompatible" msgstr "" @@ -12336,7 +12336,7 @@ msgctxt "#24050" msgid "Available Add-ons" msgstr "" -#: src/addons/addonversion.cpp +#: xbmc/addons/addonversion.cpp msgctxt "#24051" msgid "Version:" msgstr "" @@ -12352,19 +12352,19 @@ msgctxt "#24053" msgid "License:" msgstr "" -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#24054" msgid "Changelog" msgstr "" #. Used in the Add-on Manager -#: src/addons/GUIViewStateAddonBrowser.cpp +#: xbmc/addons/GUIViewStateAddonBrowser.cpp msgctxt "#24055" msgid "Check for updates" msgstr "" #. Used in the Add-on Manager to specify last update time -#: src/addons/GUIViewStateAddonBrowser.cpp +#: xbmc/addons/GUIViewStateAddonBrowser.cpp msgctxt "#24056" msgid "Last updated %s" msgstr "" @@ -12379,14 +12379,14 @@ msgctxt "#24060" msgid "Would you like to disable this Add-on?" msgstr "" -#: src/addons/Repository.cpp +#: xbmc/addons/Repository.cpp msgctxt "#24061" msgid "Add-on update available!" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp -#: src/filesystem/AddonsDirectory.cpp -#: src/filesystem/AndroidAppDirectory.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp +#: xbmc/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AndroidAppDirectory.cpp msgctxt "#24062" msgid "Enabled Add-ons" msgstr "" @@ -12395,27 +12395,27 @@ msgctxt "#24063" msgid "Auto update" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24064" msgid "Add-on enabled" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24065" msgid "Add-on updated" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24066" msgid "Cancel Add-on download?" msgstr "" -#: src/addons/guiviewstateaddonbrowser.cpp +#: xbmc/addons/guiviewstateaddonbrowser.cpp msgctxt "#24067" msgid "Currently downloading Add-ons" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24068" msgid "Update available" msgstr "" @@ -12448,7 +12448,7 @@ msgctxt "#24075" msgid "Disable" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24076" msgid "Add-on Required" msgstr "" @@ -12460,25 +12460,25 @@ msgid "Try to reconnect?" msgstr "" #. The label in the add-ons manager for helper add-ons -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24081" msgid "Helper Add-ons" msgstr "" #. The label in the add-ons manager for add-on libraries -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24082" msgid "Add-on libraries" msgstr "" #. The label in the add-ons manager for information libraries -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24083" msgid "Information libraries" msgstr "" #. The label in the add-ons manager for visualisation libraries -#: src/addons/addon.cpp +#: xbmc/addons/addon.cpp msgctxt "#24084" msgid "Visualisation libraries" msgstr "" @@ -12500,57 +12500,57 @@ msgstr "" #empty strings from id 24092 to 24093 -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#24094" msgid "(current)" msgstr "" -#: src/addons/guidialogaddoninfo.cpp +#: xbmc/addons/guidialogaddoninfo.cpp msgctxt "#24095" msgid "(blacklisted)" msgstr "" -#: src/addons/Repository.cpp +#: xbmc/addons/Repository.cpp msgctxt "#24096" msgid "Add-on is incompatible or has been marked broken in repository." msgstr "" -#: src/addons/Repository.cpp +#: xbmc/addons/Repository.cpp msgctxt "#24097" msgid "Would you like to disable it on your system?" msgstr "" -#: src/filesystem/AddonsDirectory.cpp +#: xbmc/filesystem/AddonsDirectory.cpp msgctxt "#24098" msgid "Broken" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24099" msgid "Would you like to switch to this skin?" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24100" msgid "To use this feature you must download an Add-on:" msgstr "" -#: src/addons/addoninstaller.cpp +#: xbmc/addons/addoninstaller.cpp msgctxt "#24101" msgid "Would you like to download this Add-on?" msgstr "" -#: src/Application.cpp +#: xbmc/Application.cpp msgctxt "#24102" msgid "Unable to load skin" msgstr "" -#: src/Application.cpp +#: xbmc/Application.cpp msgctxt "#24103" msgid "Skin is missing some files" msgstr "" -#: src/addons/Repository.cpp +#: xbmc/addons/Repository.cpp msgctxt "#24104" msgid "Add-on is incompatible due to unmet dependencies." msgstr "" @@ -12566,22 +12566,22 @@ msgctxt "#24106" msgid "Specify where downloaded subtitles should be saved, the same location as the video or a custom location." msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24107" msgid "Searching for subtitles ..." msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24108" msgid "%d subtitles found" msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24109" msgid "No subtitles found" msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24110" msgid "Downloading subtitles ..." msgstr "" @@ -12597,12 +12597,12 @@ msgctxt "#24112" msgid "Set languages to use when searching for subtitles. Not all subtitle services will use all languages." msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24113" msgid "Failed to download subtitle" msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24114" msgid "No subtitle services installed" msgstr "" @@ -12634,18 +12634,18 @@ msgctxt "#24119" msgid "Select service that will be used as default to search for Movie subtitles." msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24120" msgid "Manual search string" msgstr "" -#: src/dialogs/GUIDialogSubtitles.cpp +#: xbmc/dialogs/GUIDialogSubtitles.cpp msgctxt "#24121" msgid "Enter search string" msgstr "" #. Button in Add-on Manager -> Available Updates for updating all add-ons when auto-updating is off. -#: src/filesystem/AddonDirectory.cpp +#: xbmc/filesystem/AddonDirectory.cpp msgctxt "#24122" msgid "Update all" msgstr "" @@ -12703,24 +12703,24 @@ msgctxt "#25001" msgid "Hide foreign" msgstr "" -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp msgctxt "#25002" msgid "Select from all titles ..." msgstr "" #. A Blu-ray playback mode and a option in the simplified Blu-ray menu -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp #: system/settings/settings.xml msgctxt "#25003" msgid "Show Blu-ray menu" msgstr "" -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp msgctxt "#25004" msgid "Play main title: %d" msgstr "" -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp msgctxt "#25005" msgid "Title: %d" msgstr "" @@ -12730,17 +12730,17 @@ msgctxt "#25006" msgid "Select playback item" msgstr "" -#: src/filesystem/BlurayDirectory.cpp +#: xbmc/filesystem/BlurayDirectory.cpp msgctxt "#25007" msgid "Chapters: %u - duration: %s" msgstr "" -#: src/cores/dvdplayer/DVDPlayer.cpp +#: xbmc/cores/dvdplayer/DVDPlayer.cpp msgctxt "#25008" msgid "Playback of Blu-ray failed" msgstr "" -#: src/cores/dvdplayer/DVDPlayer.cpp +#: xbmc/cores/dvdplayer/DVDPlayer.cpp msgctxt "#25009" msgid "The menu of this Blu-ray is not supported" msgstr "" @@ -12964,7 +12964,7 @@ msgstr "" #: addons/skin.confluence/720p/script-globalsearch-main.xml #: xbmc\filesystem\VideoDatabaseDirectory.cpp -#: src/media/MediaTypes.cpp +#: xbmc/media/MediaTypes.cpp msgctxt "#33054" msgid "Seasons" msgstr "" @@ -13119,23 +13119,23 @@ msgstr "" #empty strings from id 33085 to 33099 -#: src/network/network.cpp +#: xbmc/network/network.cpp msgctxt "#33100" msgid "Failed to start" msgstr "" -#: src/network/network.cpp +#: xbmc/network/network.cpp #: system/settings/settings.xml msgctxt "#33101" msgid "Webserver" msgstr "" -#: src/network/network.cpp +#: xbmc/network/network.cpp msgctxt "#33102" msgid "Event Server" msgstr "" -#: src/network/network.cpp +#: xbmc/network/network.cpp msgctxt "#33103" msgid "Remote communication server" msgstr "" @@ -13358,39 +13358,39 @@ msgctxt "#34401" msgid "Failed to init video filters/scalers, falling back to bilinear scaling" msgstr "" -#: src/cores/audioengine/sinks/aesinknull.cpp +#: xbmc/cores/audioengine/sinks/aesinknull.cpp msgctxt "#34402" msgid "Failed to initialise audio device" msgstr "" -#: src/cores/audioengine/sinks/aesinknull.cpp +#: xbmc/cores/audioengine/sinks/aesinknull.cpp msgctxt "#34403" msgid "Check your audiosettings" msgstr "" #description for the touchscreen when using the tvout feature on iDevices -#: src/osx/IOSExternalTouchController.mm +#: xbmc/osx/IOSExternalTouchController.mm msgctxt "#34404" msgid "Use gestures for navigation:" msgstr "" -#: src/osx/IOSExternalTouchController.mm +#: xbmc/osx/IOSExternalTouchController.mm msgctxt "#34405" msgid "1 finger swipe left,right,up,down for cursors" msgstr "" -#: src/osx/IOSExternalTouchController.mm +#: xbmc/osx/IOSExternalTouchController.mm msgctxt "#34406" msgid "2 finger swipe left for backspace" msgstr "" -#: src/osx/IOSExternalTouchController.mm +#: xbmc/osx/IOSExternalTouchController.mm msgctxt "#34407" msgid "1 finger single tap for enter" msgstr "" -#: src/osx/IOSExternalTouchController.mm +#: xbmc/osx/IOSExternalTouchController.mm msgctxt "#34408" msgid "2 finger single tap or 1 finger long press for contextmenu" msgstr "" @@ -13403,18 +13403,18 @@ msgctxt "#35000" msgid "Peripherals" msgstr "" -#: src/pheripherals/devices/PeripheralHID.cpp -#: src/pheripherals/devices/Peripheralmon.cpp +#: xbmc/pheripherals/devices/PeripheralHID.cpp +#: xbmc/pheripherals/devices/Peripheralmon.cpp msgctxt "#35001" msgid "Generic HID device" msgstr "" -#: src/pheripherals/devices/PeripheralNIC.cpp +#: xbmc/pheripherals/devices/PeripheralNIC.cpp msgctxt "#35002" msgid "Generic network adaptor" msgstr "" -#: src/pheripherals/devices/PeripheralDisk.cpp +#: xbmc/pheripherals/devices/PeripheralDisk.cpp msgctxt "#35003" msgid "Generic disk" msgstr "" @@ -13424,12 +13424,12 @@ msgctxt "#35004" msgid "There are no settings available\nfor this peripheral." msgstr "" -#: src/pheripherals/Peripherals.cpp +#: xbmc/pheripherals/Peripherals.cpp msgctxt "#35005" msgid "New device configured" msgstr "" -#: src/pheripherals/Peripherals.cpp +#: xbmc/pheripherals/Peripherals.cpp msgctxt "#35006" msgid "Device removed" msgstr "" @@ -13492,7 +13492,7 @@ msgstr "" #empty strings from id 35505 to 35999 -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp msgctxt "#36000" msgid "Pulse-Eight CEC adaptor" msgstr "" @@ -13544,12 +13544,12 @@ msgctxt "#36010" msgid "Wake devices when deactivating screensaver" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36011" msgid "Could not detect the CEC com port. Set it up manually." msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36012" msgid "Could not initialise the CEC adaptor. Please check your settings." msgstr "" @@ -13562,12 +13562,12 @@ msgid "HDMI port number" msgstr "" #. max. 13 characters -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36016" msgid "Connected" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36017" msgid "Could not initialise the CEC adaptor: libCEC was not found on your system." msgstr "" @@ -13597,12 +13597,12 @@ msgctxt "#36022" msgid "COM port (leave empty unless needed)" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36023" msgid "Configuration updated" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36024" msgid "Failed to set the new configuration. Please check your settings." msgstr "" @@ -13617,37 +13617,37 @@ msgctxt "#36026" msgid "Put devices in standby mode when putting the PC in standby" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp msgctxt "#36027" msgid "This device needs servicing" msgstr "" #. Label for a select option -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp #: system/peripherals.xml #: system/settings.xml msgctxt "#36028" msgid "Ignore" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp #: system/peripherals.xml msgctxt "#36029" msgid "When the TV is switched off" msgstr "" -#: src/addons/addonstatushandler.cpp -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/addons/addonstatushandler.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp msgctxt "#36030" msgid "Connection lost" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp msgctxt "#36031" msgid "This user does not have permissions to open the CEC adaptor" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp msgctxt "#36032" msgid "The port is busy. Only one program can access the CEC adaptor" msgstr "" @@ -13671,31 +13671,31 @@ msgctxt "#36036" msgid "On start/stop" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp #: system/peripherals.xml msgctxt "#36037" msgid "TV" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp #: system/peripherals.xml msgctxt "#36038" msgid "Amplifier / AVR device" msgstr "" -#: src/peripherals/devices/PeripheralCecAdapter.cpp +#: xbmc/peripherals/devices/PeripheralCecAdapter.cpp #: system/peripherals.xml msgctxt "#36039" msgid "TV and AVR device (explicit)" msgstr "" -#: src/peripherals/devices/peripheralcecadapter.cpp +#: xbmc/peripherals/devices/peripheralcecadapter.cpp msgctxt "#36040" msgid "Unsupported libCEC interface version. %x is lower than the version Kodi supports (%x)" msgstr "" -#: src/video/dialogs/guidialogvideoinfo.cpp -#: src/music/dialogs/GUIDialogMusicInfo.cpp +#: xbmc/video/dialogs/guidialogvideoinfo.cpp +#: xbmc/music/dialogs/GUIDialogMusicInfo.cpp msgctxt "#36041" msgid "* Item folder" msgstr "" @@ -15639,14 +15639,14 @@ msgstr "" #. name of a stereoscopic mode #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#36503" msgid "Over/Under" msgstr "" #. name of a stereoscopic mode #: system/settings/settings.xml -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#36504" msgid "Side by side" msgstr "" @@ -15763,14 +15763,14 @@ msgstr "" #. label of a setting, allowing to specify the stereoscopic 3D mode of a video #: guilib/StereoscopicsManager.cpp -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#36535" msgid "Stereoscopic 3D mode of video" msgstr "" #. label of a toggle option that allows to invert the stereoscopic 3d mode #: guilib/StereoscopicsManager.cpp -#: src/video/dialogs/GUIDialogVideoSettings.cpp +#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp msgctxt "#36536" msgid "Invert Stereoscopic 3D mode (flip eyes)" msgstr "" @@ -15877,156 +15877,156 @@ msgstr "" #empty strings from id 36604 to 36899 -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36900" msgid "movie" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36901" msgid "movies" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36902" msgid "TV show" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36903" msgid "TV shows" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36904" msgid "season" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36905" msgid "seasons" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36906" msgid "episode" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36907" msgid "episodes" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36908" msgid "musicvideo" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36909" msgid "musicvideos" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36910" msgid "set" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36911" msgid "sets" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36912" msgid "video" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36913" msgid "videos" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36914" msgid "music" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36915" msgid "music" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36916" msgid "artist" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36917" msgid "artists" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36918" msgid "album" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36919" msgid "albums" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36920" msgid "song" msgstr "" -#: src/media/MediaType.cpp +#: xbmc/media/MediaType.cpp msgctxt "#36921" msgid "songs" msgstr "" #empty strings from id 36922 to 36999 -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37000" msgid "(Visually Impaired)" msgstr "" -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37001" msgid "(Directors Comments)" msgstr "" -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37002" msgid "(Directors Comments 2)" msgstr "" #empty strings from id 37003 to 37010 -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37011" msgid "(CC)" msgstr "" -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37012" msgid "(Forced)" msgstr "" -#: src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp +#: xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp msgctxt "#37013" msgid "(Directors Comments)" msgstr "" -#: src/GUIInfoManager.cpp +#: xbmc/GUIInfoManager.cpp msgctxt "#37014" msgid "Last used profile" msgstr "" -#: src/Windows/GUIMediaWindow.cpp +#: xbmc/Windows/GUIMediaWindow.cpp msgctxt "#37015" msgid "Browse Into" msgstr "" @@ -16059,12 +16059,12 @@ msgctxt "#37021" msgid "Set GUI resolution limit" msgstr "" -#: src/network/upnp/UPnPPlayer.cpp +#: xbmc/network/upnp/UPnPPlayer.cpp msgctxt "#37022" msgid "UPnP Player" msgstr "" -#: src/network/upnp/UPnPPlayer.cpp +#: xbmc/network/upnp/UPnPPlayer.cpp msgctxt "#37023" msgid "Do you wish to stop playback on the remote device?" msgstr "" diff --git a/lib/addons/library.xbmc.addon/Makefile.in b/lib/addons/library.xbmc.addon/Makefile.in index 92094a0a82..b9d327d6cc 100644 --- a/lib/addons/library.xbmc.addon/Makefile.in +++ b/lib/addons/library.xbmc.addon/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../src/addons/include -I../../../src +INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_addon @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp index 2c695b65bc..4dd4d5be9d 100644 --- a/lib/addons/library.xbmc.addon/libXBMC_addon.cpp +++ b/lib/addons/library.xbmc.addon/libXBMC_addon.cpp @@ -22,9 +22,9 @@ #include #include #include -#include "../../../src/addons/include/xbmc_addon_types.h" +#include "../../../xbmc/addons/include/xbmc_addon_types.h" #include "../../../addons/library.xbmc.addon/libXBMC_addon.h" -#include "../../../src/addons/AddonCallbacks.h" +#include "../../../xbmc/addons/AddonCallbacks.h" #ifdef _WIN32 #include diff --git a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj index 917d09d501..41120beff3 100644 --- a/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj +++ b/lib/addons/library.xbmc.addon/project/VS2010Express/libXBMC_addon.vcxproj @@ -50,7 +50,7 @@ - ..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories) VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync @@ -62,7 +62,7 @@ - ..\..\..\..\..\src\addons\include;..\..\..\..\..\src\addons;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\src;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\addons;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;..\..\..\..\..\xbmc;%(AdditionalIncludeDirectories) HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.codec/Makefile.in b/lib/addons/library.xbmc.codec/Makefile.in index 83a6b5062e..505c08f742 100644 --- a/lib/addons/library.xbmc.codec/Makefile.in +++ b/lib/addons/library.xbmc.codec/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../src/addons/include +INCLUDES=-I. -I../../../xbmc/addons/include DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_codec @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj index 6519a33f81..67f6c384d9 100644 --- a/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj +++ b/lib/addons/library.xbmc.codec/project/VS2010Express/libXBMC_codec.vcxproj @@ -50,7 +50,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync @@ -62,7 +62,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.gui/Makefile.in b/lib/addons/library.xbmc.gui/Makefile.in index 2f5615f8c4..8a75239d46 100644 --- a/lib/addons/library.xbmc.gui/Makefile.in +++ b/lib/addons/library.xbmc.gui/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers +INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_gui @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj index edd17d5e5e..fa88231678 100644 --- a/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj +++ b/lib/addons/library.xbmc.gui/project/VS2010Express/libXBMC_gui.vcxproj @@ -50,7 +50,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync @@ -62,7 +62,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/lib/addons/library.xbmc.pvr/Makefile.in b/lib/addons/library.xbmc.pvr/Makefile.in index 96f37138a5..8c10e0d5b3 100644 --- a/lib/addons/library.xbmc.pvr/Makefile.in +++ b/lib/addons/library.xbmc.pvr/Makefile.in @@ -1,5 +1,5 @@ ARCH=@ARCH@ -INCLUDES=-I. -I../../../src/addons/include -I../../../src -I../../../src/cores/dvdplayer/DVDDemuxers +INCLUDES=-I. -I../../../xbmc/addons/include -I../../../xbmc -I../../../xbmc/cores/dvdplayer/DVDDemuxers DEFINES+= CXXFLAGS=-fPIC LIBNAME=libXBMC_pvr @@ -11,9 +11,9 @@ all: $(LIB_SHARED) $(LIB_SHARED): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif diff --git a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj index 87dd972071..b5da9b99d2 100644 --- a/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj +++ b/lib/addons/library.xbmc.pvr/project/VS2010Express/libXBMC_pvr.vcxproj @@ -50,7 +50,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync @@ -62,7 +62,7 @@ - ..\..\..\..\..\src;..\..\..\..\..\src\addons\include;..\..\..\..\..\src\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) + ..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories) HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions) Sync diff --git a/lib/asap/Makefile.in b/lib/asap/Makefile.in index 782c46d1d1..7e6df0dd82 100644 --- a/lib/asap/Makefile.in +++ b/lib/asap/Makefile.in @@ -19,7 +19,7 @@ XMMS_INPUT_PLUGIN_DIR = `xmms-config --input-plugin-dir` XMMS_USER_PLUGIN_DIR = $(HOME)/.xmms/Plugins MOC_INCLUDE = ../moc-2.4.4 MOC_PLUGIN_DIR = /usr/local/lib/moc/decoder_plugins -XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/src/cores/DllLoader/exports +XBMC_DLL_LOADER_EXPORTS = @abs_top_srcdir@/xbmc/cores/DllLoader/exports COMMON_C = asap.c acpu.c apokeysnd.c COMMON_H = asap.h asap_internal.h anylang.h players.h @@ -51,8 +51,8 @@ libasap_decoder.so: moc/libasap_decoder.c $(COMMON_C) $(COMMON_H) asap-xbmc: mads/mads xasm/xasm @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so -src/xbmc_asap.o: src/xbmc_asap.c - $(CC) -I. -O2 -o $@ -c src/xbmc_asap.c +xbmc/xbmc_asap.o: xbmc/xbmc_asap.c + $(CC) -I. -O2 -o $@ -c xbmc/xbmc_asap.c asap.o: asap.c $(COMMON_H) $(CC) -I. -O2 -o $@ -c asap.c @@ -63,8 +63,8 @@ acpu.o: acpu.c $(COMMON_H) apokeysnd.o: apokeysnd.c $(CC) -I. -O2 -o $@ -c apokeysnd.c -@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: src/xbmc_asap.o $(COMMON_O) $(COMMON_H) - $(CC) -shared -fPIC -o $@ -I. src/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O) +@abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so: xbmc/xbmc_asap.o $(COMMON_O) $(COMMON_H) + $(CC) -shared -fPIC -o $@ -I. xbmc/xbmc_asap.o `cat $(XBMC_DLL_LOADER_EXPORTS)/wrapper.def` $(XBMC_DLL_LOADER_EXPORTS)/wrapper.o $(COMMON_O) players.h: files2anylang.pl $(PLAYERS_OBX) $(PERL) files2anylang.pl $(PLAYERS_OBX) >$@ @@ -149,7 +149,7 @@ players-clean: distclean: clean clean: players-clean - $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h src/xbmc_asap.o + $(RM) asap2wav libasap.a asap.o acpu.o apokeysnd.o libasap-xmms.so libasap_decoder.so @abs_top_srcdir@/system/players/paplayer/xbmc_asap-@ARCH@.so players.h xbmc/xbmc_asap.o README.html: README INSTALL NEWS CREDITS $(ASCIIDOC) -o $@ -a asapsrc -a asapports README diff --git a/lib/cmyth/Win32/libcmyth.vcxproj b/lib/cmyth/Win32/libcmyth.vcxproj index 0e9428e57f..d075528131 100644 --- a/lib/cmyth/Win32/libcmyth.vcxproj +++ b/lib/cmyth/Win32/libcmyth.vcxproj @@ -53,7 +53,7 @@ - ../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32 + ../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32 WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -85,7 +85,7 @@ - ../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../src/win32 + ../include;../librefmem;../libcmyth;%(AdditionalIncludeDirectories);$(SolutionDir)../../xbmc/win32 WIN32_LEAN_AND_MEAN;_LIB;inline=__inline;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in index 44aa4d38f5..54387cc99a 100644 --- a/lib/libdvd/Makefile.in +++ b/lib/libdvd/Makefile.in @@ -8,8 +8,8 @@ SOS= libdvdnav-$(ARCH).so DIRS= libdvdread \ libdvdnav -WRAPPER=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o -WRAPPER_MACH_ALIAS=@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias +WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o +WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias ifeq ($(findstring osx,$(ARCH)),osx) LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress diff --git a/lib/libexif/Makefile.in b/lib/libexif/Makefile.in index 0a45c3bf90..cab9560dd1 100644 --- a/lib/libexif/Makefile.in +++ b/lib/libexif/Makefile.in @@ -10,12 +10,12 @@ SLIB=@abs_top_srcdir@/system/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/libhdhomerun/Makefile.in b/lib/libhdhomerun/Makefile.in index da8f38ed4f..ce909c17ca 100644 --- a/lib/libhdhomerun/Makefile.in +++ b/lib/libhdhomerun/Makefile.in @@ -20,13 +20,13 @@ SLIB=$(SYSDIR)/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \ + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif hdhomerun_dll : $(OBJS) diff --git a/lib/libsidplay2/Makefile.in b/lib/libsidplay2/Makefile.in index cc1c6f5ffa..5dda4c9328 100644 --- a/lib/libsidplay2/Makefile.in +++ b/lib/libsidplay2/Makefile.in @@ -3,7 +3,7 @@ ARCH=@ARCH@ SIDFLAGS =-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \ -DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \ -Ibuilders/resid-builder/include/sidplay/builders \ - -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -I. -fPIC + -Ilibsidplay/include/sidplay -Iresid -Ilibsidplay/include -fPIC CFLAGS += $(SIDFLAGS) CXXFLAGS += $(SIDFLAGS) ifeq ($(ARCH), powerpc-osx) @@ -54,18 +54,13 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(SILENT_CPP) $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else - $(SILENT_CPP) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include -%.o: %.cpp - @rm -f $@ - $(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $< -o $@ \ - && $(GEN_DEPS) - diff --git a/lib/nosefart/Makefile.in b/lib/nosefart/Makefile.in index 453d1c4824..0da88b6a76 100644 --- a/lib/nosefart/Makefile.in +++ b/lib/nosefart/Makefile.in @@ -27,12 +27,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/nosefart-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/snesapu/SNES/SNESAPU/Makefile.in b/lib/snesapu/SNES/SNESAPU/Makefile.in index 7d23efca46..89c9955851 100644 --- a/lib/snesapu/SNES/SNESAPU/Makefile.in +++ b/lib/snesapu/SNES/SNESAPU/Makefile.in @@ -17,12 +17,12 @@ SLIB=$(SYSDIR)/$(SO) $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) else $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif %o : %Asm diff --git a/lib/stsound/StSoundLibrary/Makefile.in b/lib/stsound/StSoundLibrary/Makefile.in index c190180184..595cf8711b 100644 --- a/lib/stsound/StSoundLibrary/Makefile.in +++ b/lib/stsound/StSoundLibrary/Makefile.in @@ -20,12 +20,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/stsoundlibrary-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/timidity/Makefile.in b/lib/timidity/Makefile.in index 94c60617d7..3e33e8926c 100644 --- a/lib/timidity/Makefile.in +++ b/lib/timidity/Makefile.in @@ -53,11 +53,11 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/timidity-@ARCH@.so $(SLIB): $(OBJS) exports.def ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias -bundle \ - -undefined dynamic_lookup -read_only_relocs suppress -o $@ @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias -bundle \ + -undefined dynamic_lookup -read_only_relocs suppress -o $@ @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o -Wl,--version-script=exports.def + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \ + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -Wl,--version-script=exports.def endif include @abs_top_srcdir@/Makefile.include diff --git a/lib/vgmstream/Makefile.in b/lib/vgmstream/Makefile.in index 3455459902..edbaceff23 100644 --- a/lib/vgmstream/Makefile.in +++ b/lib/vgmstream/Makefile.in @@ -195,12 +195,12 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/vgmstream-@ARCH@.so $(SLIB): $(OBJS) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O) else $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \ - `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o endif diff --git a/project/VS2010Express/UnrarXLib.vcxproj b/project/VS2010Express/UnrarXLib.vcxproj index 99ef7c2a23..2f8d090a9c 100644 --- a/project/VS2010Express/UnrarXLib.vcxproj +++ b/project/VS2010Express/UnrarXLib.vcxproj @@ -54,7 +54,7 @@ - ..\..\src;..\..\src\win32\; + ..\..\xbmc;..\..\xbmc\win32\; NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;_SECURE_SCL=0;%(PreprocessorDefinitions) Use rar.hpp @@ -68,7 +68,7 @@ /MP %(AdditionalOptions) - ..\..\src;..\..\src\win32\; + ..\..\xbmc;..\..\xbmc\win32\; NOMINMAX;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) true Use @@ -200,4 +200,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index c785502ff4..ef8a99893d 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnrarXLib", "UnrarXLib.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhts", "..\..\lib\libhts\Win32\libhts_2010.vcxproj", "{00700E12-A63B-4E54-B962-4011A90584BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visMilkdrop", "..\..\src\visualizations\Milkdrop\Plugin.vcxproj", "{5E479372-4F34-426D-AA1E-9879E94C105D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visMilkdrop", "..\..\xbmc\visualizations\Milkdrop\Plugin.vcxproj", "{5E479372-4F34-426D-AA1E-9879E94C105D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcmyth_dll", "..\..\lib\cmyth\Win32\libcmyth.vcxproj", "{F9E6874D-60A8-49BA-9393-A2105E63ABCF}" EndProject @@ -41,13 +41,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageLib_zlib", "..\..\lib\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexif_dll", "..\..\lib\libexif\libexif.vcxproj", "{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visDirectxSpectrum", "..\..\src\visualizations\DirectXSpectrum\directx_spectrum.vcxproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visDirectxSpectrum", "..\..\xbmc\visualizations\DirectXSpectrum\directx_spectrum.vcxproj", "{0D91724A-E6F6-4708-AF47-9F88BBE2114C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmodplug_2010", "..\..\lib\libmodplug\libmodplug_2010.vcxproj", "{C15B374E-7126-48FF-B618-A375D7B17FCF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libRTV", "..\..\lib\libRTV\libRTV.vcxproj", "{DD4818AE-7E35-40B7-A6A0-0FF83AA1C916}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visWaveform", "..\..\src\visualizations\WaveForm\Waveform.vcxproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visWaveform", "..\..\xbmc\visualizations\WaveForm\Waveform.vcxproj", "{D450FE9A-CE56-4496-B4AB-379094E642F2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squish", "..\..\lib\libsquish\vs7\squish\squish_2010.vcxproj", "{6A8518C3-D81A-4428-BD7F-C37933088AC1}" EndProject @@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\lib\gtest\ms EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libXBMC_codec", "..\..\lib\addons\library.xbmc.codec\project\VS2010Express\libXBMC_codec.vcxproj", "{F8F1290B-1188-4810-86C9-88178A31D2AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visVortex", "..\..\src\visualizations\Vortex\Vortex\Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visVortex", "..\..\xbmc\visualizations\Vortex\Vortex\Vortex.vcxproj", "{AFF288D5-8A77-4817-8DD9-364E183CDBF8}" ProjectSection(ProjectDependencies) = postProject {034B1D02-CA92-455D-8866-DB95BEE49C10} = {034B1D02-CA92-455D-8866-DB95BEE49C10} EndProjectSection diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 078931ea59..aca7b82515 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -75,7 +75,7 @@ - ..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories) + ..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories) NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions) Async Use @@ -107,7 +107,7 @@ - ..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) + ..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) _CONSOLE;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;_SECURE_SCL=0;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions) Async Use @@ -142,7 +142,7 @@ /MP %(AdditionalOptions) - ..\..\;..\..\src\;..\..\src\cores\dvdplayer;..\..\src\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\src\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories) + ..\..\;..\..\xbmc\;..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\lib;..\..\lib\win32\ffmpeg;..\..\lib\libUPnP;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Platinum\Source\Extras;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32;..\..\xbmc\cores\AudioEngine\;..\..\addons\library.xbmc.gui;..\..\addons\library.xbmc.addon;..\..\addons\library.xbmc.pvr;..\..\addons\library.xbmc.codec;%(AdditionalIncludeDirectories) NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;TAGLIB_STATIC;NPT_CONFIG_ENABLE_LOGGING;PLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi";PLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi";%(PreprocessorDefinitions) Async Use @@ -171,2040 +171,2040 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - true - true - - - true - true - - - true - true - - - true - true - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + + + + + + + + + CALL update_git_rev.bat - ..\..\src\win32\git_rev.h - ..\..\.git\HEAD;..\..\src\win32\git_rev.tmpl + ..\..\xbmc\win32\git_rev.h + ..\..\.git\HEAD;..\..\xbmc\win32\git_rev.tmpl Retrieving the git revision - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp CompileAsCpp CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - - + + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - + true true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create Create Create - - - - - - - + + + + + + + true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAsCpp CompileAsCpp CompileAsCpp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj - - - - + + + + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj - - - - + + + + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj - - - - - - + + + + + + $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true true - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true true - + true true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2212,32 +2212,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2245,121 +2245,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + true ..\..\tools\windows\packaging\media;%(AdditionalIncludeDirectories) @@ -2408,7 +2408,7 @@ - + Document CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename) Generating SWIG bindings @@ -2420,7 +2420,7 @@ Generating SWIG bindings %(RelativeDir)..\python\generated\%(Filename).cpp - + Document CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename) Generating SWIG bindings @@ -2432,7 +2432,7 @@ Generating SWIG bindings %(RelativeDir)..\python\generated\%(Filename).cpp - + Document CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename) Generating SWIG bindings @@ -2444,7 +2444,7 @@ Generating SWIG bindings %(RelativeDir)..\python\generated\%(Filename).cpp - + Document CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename) Generating SWIG bindings @@ -2456,7 +2456,7 @@ Generating SWIG bindings %(RelativeDir)..\python\generated\%(Filename).cpp - + Document CALL ..\..\tools\codegenerator\GenerateSWIGBindings.bat %(RelativeDir) %(Filename) Generating SWIG bindings @@ -2470,7 +2470,7 @@ - + CALL ..\..\tools\windows\JsonSchemaBuilder.bat Generating ServiceDescription.h for JSON-RPC API %(RelativeDir)..\ServiceDescription.h @@ -2481,7 +2481,7 @@ %(RelativeDir)..\ServiceDescription.h %(RelativeDir)..\ServiceDescription.h - + Document CALL ..\..\tools\windows\JsonSchemaBuilder.bat Generating ServiceDescription.h for JSON-RPC API @@ -2493,7 +2493,7 @@ %(RelativeDir)..\ServiceDescription.h %(RelativeDir)..\ServiceDescription.h - + Document CALL ..\..\tools\windows\JsonSchemaBuilder.bat Generating ServiceDescription.h for JSON-RPC API @@ -2505,7 +2505,7 @@ %(RelativeDir)..\ServiceDescription.h %(RelativeDir)..\ServiceDescription.h - + Document CALL ..\..\tools\windows\JsonSchemaBuilder.bat Generating ServiceDescription.h for JSON-RPC API @@ -2517,7 +2517,7 @@ %(RelativeDir)..\ServiceDescription.h %(RelativeDir)..\ServiceDescription.h - + CALL ..\..\tools\windows\JsonSchemaBuilder.bat Generating ServiceDescription.h for JSON-RPC API %(RelativeDir)..\ServiceDescription.h @@ -2528,19 +2528,19 @@ %(RelativeDir)..\ServiceDescription.h %(RelativeDir)..\ServiceDescription.h - + CALL ..\..\tools\windows\CompileInfo.bat Generating CompileInfo.cpp - ..\..\src\CompileInfo.cpp;..\..\src\win32\XBMC_PC.rc + ..\..\xbmc\CompileInfo.cpp;..\..\xbmc\win32\XBMC_PC.rc CALL ..\..\tools\windows\CompileInfo.bat Generating CompileInfo.cpp - ..\..\src\CompileInfo.cpp + ..\..\xbmc\CompileInfo.cpp CALL ..\..\tools\windows\CompileInfo.bat Generating CompileInfo.cpp - ..\..\src\CompileInfo.cpp + ..\..\xbmc\CompileInfo.cpp @@ -2552,4 +2552,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index c67ca1f486..76034478a0 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -324,2957 +324,2957 @@ - + win32 - + win32 - + win32 - + win32 - + win32 - + cores - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer\DVDCodecs - + cores\dvdplayer\DVDCodecs - + cores\dvdplayer\DVDCodecs\Audio - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay\libspucc - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader\exports - + cores\DllLoader\exports - + cores\DllLoader\exports - + cores\DllLoader\exports\util - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers\Shaders - + cores\VideoRenderers\Shaders - + cores\ExternalPlayer - + cores\PlayerCoreFactory - + cores\PlayerCoreFactory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + cores\VideoRenderers\Shaders - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDInputStreams - + addons - + guilib - - - - + + + + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music - + music - + music - + music - + music - + cdrip - + cdrip - + cdrip - + cdrip - + addons - + addons - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - - - - - + + + + + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + input - + input - + input - + input - + input - + input\windows - + input\windows - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + music\dialogs - + music\dialogs - + music\dialogs - + music\dialogs - + music\dialogs - + music\infoscanner - + music\infoscanner - + music\infoscanner - + music\infoscanner - + music\windows - + music\windows - + music\windows - + music\windows - + music\windows - + music\windows - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network\windows - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + powermanagement - + powermanagement\windows - + programs - + programs - + rendering - + rendering\dx - + rendering\dx - + settings - + settings - + settings - + storage - + storage - + storage - + storage - + storage\windows - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + video - + video - + video - + video - + video - + video - + video - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\windows - + video\windows - + video\windows - + video\windows - + windowing - + windowing\windows - + windowing\windows - + windowing\windows - + addons - + addons - + dialogs - + interfaces - + interfaces - + powermanagement - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + utils - + utils - + addons - + epg - + epg - + epg - + epg - + epg - + filesystem - + filesystem - + utils - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDDemuxers - + utils - + win32 - + win32 - + pvr\windows - + pvr\timers - + pvr\timers - + pvr\recordings - + pvr\recordings - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\addons - + dialogs - + pvr - + pvr - + cores\VideoRenderers - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\addons - + addons - + addons - + addons - + addons libs\SlingboxLib - + dialogs - + pvr - + interfaces\json-rpc - + win32 - + interfaces\json-rpc - + epg - + input - + utils - + utils - + addons - + guilib - + guilib - + input - + interfaces\info - + interfaces\info - + guilib - + interfaces\json-rpc - + guilib - + interfaces\info - + network - + utils - + network\mdns - + peripherals - + peripherals\bus - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\bus - + peripherals\devices - + peripherals\devices - + peripherals\dialogs - + peripherals\dialogs - + filesystem - + filesystem - + network\httprequesthandler - + utils - + utils - + utils - + network\websocket - + network\websocket - + network\websocket - + network\websocket - + interfaces\json-rpc - + utils - + network\httprequesthandler - + network\httprequesthandler - + network\httprequesthandler - + network\httprequesthandler - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + utils - - + + utils - - + + network - + network\mdns - + cores\AudioEngine\Encoders - + cores\AudioEngine - + cores\AudioEngine - + cores\AudioEngine - + cores\AudioEngine\Sinks - + cores\AudioEngine\Sinks - + cores\AudioEngine\Sinks - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\dvdplayer\DVDCodecs\Audio - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + addons - + music - + video - - utils - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + utils + + + + + + + + + + + + + + + + + + + + + + + + + + + + pictures - + music - + video - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - - + + utils - + input\windows - + filesystem - + network\httprequesthandler - + network - + utils - + utils - + utils - + music\karaoke - + utils - + utils - + guilib - + dialogs - + peripherals\devices - + video - - + + utils - + music - + test - + test - + test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + utils\test - + filesystem\test - + filesystem\test - + filesystem\test - + filesystem\test - + filesystem\test - + network\upnp - + network\upnp - + network\upnp - + network\upnp - + network\upnp - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\python - + interfaces\python - + interfaces\python - + interfaces\python - + interfaces\python\generated - + interfaces\python\generated - + interfaces\python\generated - + interfaces\python\generated - + interfaces\python\generated - + music\tags - + music\tags - + interfaces\python\test - + interfaces\json-rpc - + cores\dvdplayer\DVDDemuxers - + dialogs - + test - + test - + interfaces\json-rpc - + filesystem - + utils - + cores\AudioEngine\Utils - + utils\test - + interfaces\python - + video - + view - + view - + view - + guilib - + guilib - + filesystem - + filesystem - + peripherals\bus - + network\upnp - - + + settings\dialogs - + settings\windows - + settings\windows - + settings\windows - + settings\windows - + utils - + settings - + settings - + view - + settings - + settings - + profiles\dialogs - + profiles\dialogs - + profiles\windows - + profiles - + profiles - + input\touch\generic - + input\touch\generic - + input\touch - + utils - + video - + filesystem\VideoDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + settings\windows - + settings - + network - + utils - + settings - + settings - + interfaces\json-rpc - + cores\dvdplayer\DVDDemuxers - + utils - + utils - + interfaces\generic - + interfaces\generic - + interfaces\python - + addons - + interfaces\json-rpc - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + utils - - + + interfaces\python - + utils - + windowing - + playlists - - + + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + utils - + cores\VideoRenderers - + interfaces\json-rpc - + listproviders - + listproviders - + listproviders - + utils - + utils - + cores\dvdplayer\DVDCodecs\Video - + cores - + media - + settings\dialogs - + settings\dialogs - + settings - + settings - + settings\dialogs - + settings - + filesystem\win32 - - + + utils - + filesystem\win32 - + utils\win32 - + utils\win32 - + filesystem\win32 - + filesystem\win32 - + utils - + filesystem - + video\videosync - + cores - + win32 - + win32 - + win32 - + win32 - + cores - + cores - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer - + cores\dvdplayer\DVDCodecs - + cores\dvdplayer\DVDCodecs - + cores\dvdplayer\DVDCodecs - + cores\dvdplayer\DVDCodecs\Audio - + cores\dvdplayer\DVDCodecs\Audio - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Video - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay - + cores\dvdplayer\DVDCodecs\Overlay\libspucc - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDDemuxers - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDInputStreams @@ -3298,76 +3298,76 @@ cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDHeaders - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\paplayer - + cores\paplayer - + cores\paplayer @@ -3391,2686 +3391,2686 @@ cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\paplayer - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader - + cores\DllLoader\exports - + cores\DllLoader\exports - + cores\DllLoader\exports - + cores\DllLoader\exports\util - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers - + cores\VideoRenderers\Shaders - + cores\VideoRenderers\Shaders - + cores\ExternalPlayer - + cores\PlayerCoreFactory - + cores\PlayerCoreFactory - + cores\PlayerCoreFactory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + filesystem\VideoDatabaseDirectory - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + addons - + cores\VideoRenderers\Shaders - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDSubtitles - + cores\dvdplayer\DVDInputStreams - + addons - + guilib - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music\karaoke - + music - + music - + music - + music - + music - + cdrip - + cdrip - + cdrip - + cdrip - + addons - + addons - + addons - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - + dialogs - - - + + + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + input - + input - + input - + input - + input - + input - + input - + input - + input - + input - + input\windows - + input\windows - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + music\dialogs - + music\dialogs - + music\dialogs - + music\dialogs - + music\dialogs - + music\infoscanner - + music\infoscanner - + music\infoscanner - + music\infoscanner - + music\windows - + music\windows - + music\windows - + music\windows - + music\windows - + music\windows - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + music\tags - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network - + network\windows - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + pictures - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + playlists - + powermanagement - + powermanagement - + powermanagement\windows - + programs - + programs - + rendering - + rendering\dx - + rendering\dx - + settings - + settings - + settings - + storage - + storage - + storage - + storage - + storage - + storage\windows - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + utils - + video - + video - + video - + video - + video - + video - + video - + video - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\dialogs - + video\windows - + video\windows - + video\windows - + video\windows - + windowing - + windowing - + windowing - + windowing - + windowing\windows - + windowing\windows - + windowing\windows - + addons - + addons - + dialogs - + interfaces - + interfaces - + interfaces - + powermanagement - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + windows - + utils - + addons - + epg - + epg - + epg - + epg - + epg - + filesystem - + filesystem - + addons - + utils - + cores\dvdplayer\DVDInputStreams - + cores\dvdplayer\DVDDemuxers - + utils - + win32 - + win32 - + pvr\windows - + pvr\timers - + pvr\timers - + pvr\recordings - + pvr\recordings - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\dialogs - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\channels - + pvr\addons - + dialogs - + pvr - + pvr - + cores\VideoRenderers - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + pvr\windows - + utils - + pvr\addons - + addons - + addons - + addons - + addons libs\SlingboxLib - + dialogs - + pvr - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + epg - + input - + utils - + utils - + addons cores\dvdplayer\DVDHeaders - + guilib - + guilib - + guilib - + input - + interfaces\info - + interfaces\info - + guilib - + interfaces\json-rpc - + guilib - + interfaces\info - + network - + utils - + network\mdns - + network - + peripherals - + peripherals\bus - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\devices - + peripherals\bus - + peripherals - + peripherals\devices - + peripherals\devices - + peripherals\dialogs - + peripherals\dialogs - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - - + + filesystem - + filesystem - + filesystem - + filesystem - + filesystem - + utils - + filesystem - + utils - + utils - + network\websocket - + network\websocket - + network\websocket - + network\websocket - + interfaces\json-rpc - + interfaces\json-rpc - + interfaces\json-rpc - + utils - + network\httprequesthandler - + network\httprequesthandler - + network\httprequesthandler - + network\httprequesthandler - + network\httprequesthandler - + utils - + network - + network\mdns - + cores\AudioEngine\Encoders - + cores\AudioEngine - + cores\AudioEngine - + cores\AudioEngine - + cores\AudioEngine - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Interfaces - + cores\AudioEngine\Sinks - + cores\AudioEngine\Sinks - + cores\AudioEngine\Sinks - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\AudioEngine\Utils - + cores\dvdplayer\DVDCodecs\Audio - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + guilib - + addons - + music - + video - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pictures - + music - + video - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - + dbwrappers - - - + + + utils - + input\windows - + filesystem - + network\httprequesthandler - + network - + network - + utils - + utils - + utils - + utils - + guilib - + guilib - + dialogs - + peripherals\devices - + video - - + + utils - + music - + test - + test - + network\upnp - + network\upnp - + network\upnp - + network\upnp - + network\upnp - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\legacy - + interfaces\python - + interfaces\python - + interfaces\python - + interfaces\python - + interfaces\python - + interfaces\python - + music\tags - + music\tags - + interfaces\json-rpc - + cores\dvdplayer\DVDDemuxers - + utils - + dialogs - + interfaces\json-rpc - + filesystem - + utils - + cores\AudioEngine\Utils - + interfaces\python - + guilib - + guilib - + guilib - + music\karaoke - + video - + view - + view - + view - + view - + filesystem - + filesystem - + peripherals\bus - + network\upnp - - + + settings\dialogs - + settings\windows - + settings\windows - + settings\windows - + settings\windows - + utils - + utils - + settings - + settings - + view - + settings - + settings - + profiles\dialogs - + profiles\dialogs - + profiles\windows - + profiles - + profiles - + input\touch - + input\touch\generic - + input\touch - + input\touch\generic - + input\touch\generic - + input\touch - + input\touch - + utils - + video - + filesystem\VideoDatabaseDirectory - + filesystem\MusicDatabaseDirectory - + settings\windows - + settings - + network - + utils - + utils - + settings - + settings - + interfaces\json-rpc - + cores\dvdplayer\DVDDemuxers - + utils - + utils - + interfaces\generic - + interfaces\generic - + interfaces\generic - + interfaces\python - + interfaces\generic - + addons - + interfaces\json-rpc - - + + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + cores\AudioEngine\Engines\ActiveAE - + utils - - + + interfaces\python - + utils - + utils - - + + playlists - - + + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + settings\lib - + utils - + cores\VideoRenderers - + interfaces\json-rpc - + listproviders - + listproviders - + listproviders - + utils - + utils - + win32 - + cores - + media - + guilib - + settings\dialogs - + settings\dialogs - + settings - + settings - + settings\dialogs - + settings - + filesystem\win32 - - + + utils - + filesystem\win32 - + utils - + utils\win32 - + utils\win32 - + filesystem\win32 - + filesystem\win32 - + utils - + settings - + filesystem - + video\videosync - + video\videosync - + cores - + win32 - + interfaces\swig - + interfaces\swig - + interfaces\swig - + interfaces\swig - + interfaces\swig - - + + interfaces\json-rpc\schema - + interfaces\json-rpc\schema - + interfaces\json-rpc\schema - + interfaces\json-rpc\schema - + interfaces\json-rpc\schema - + interfaces\swig - + \ No newline at end of file diff --git a/project/VS2010Express/XbmcCommons.vcxproj b/project/VS2010Express/XbmcCommons.vcxproj index 34f18fe4e2..18af62a925 100644 --- a/project/VS2010Express/XbmcCommons.vcxproj +++ b/project/VS2010Express/XbmcCommons.vcxproj @@ -11,13 +11,13 @@ - - + + - - - + + + {87DA0A1E-3F33-4927-A5E5-2D58F2C58E17} @@ -69,7 +69,7 @@ - ..\..\src;..\..\src\win32 + ..\..\xbmc;..\..\xbmc\win32 NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;_SECURE_SCL=0;%(PreprocessorDefinitions) 4800;4018;4146;4996;%(DisableSpecificWarnings) @@ -78,7 +78,7 @@ /MP %(AdditionalOptions) - ..\..\src;..\..\src\win32 + ..\..\xbmc;..\..\xbmc\win32 NOMINMAX;_LIB;_USE_32BIT_TIME_T;HAS_DX;%(PreprocessorDefinitions) commons.hpp @@ -91,4 +91,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/XbmcCommons.vcxproj.filters b/project/VS2010Express/XbmcCommons.vcxproj.filters index 1d6ad1271c..e91146b331 100644 --- a/project/VS2010Express/XbmcCommons.vcxproj.filters +++ b/project/VS2010Express/XbmcCommons.vcxproj.filters @@ -1,12 +1,12 @@  - - + + - - - + + + - + \ No newline at end of file diff --git a/project/VS2010Express/XbmcThreads.vcxproj b/project/VS2010Express/XbmcThreads.vcxproj index e1b73be1e1..8ce0f502fe 100644 --- a/project/VS2010Express/XbmcThreads.vcxproj +++ b/project/VS2010Express/XbmcThreads.vcxproj @@ -11,41 +11,41 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -98,7 +98,7 @@ - ..\..\src;..\..\src\win32 + ..\..\xbmc;..\..\xbmc\win32 NOMINMAX;_LIB;_XBMC;_USE_32BIT_TIME_T;_SECURE_SCL=0;%(PreprocessorDefinitions) 4800;4018;4146;4996;%(DisableSpecificWarnings) Async @@ -110,7 +110,7 @@ /MP %(AdditionalOptions) - ..\..\src;..\..\src\win32 + ..\..\xbmc;..\..\xbmc\win32 NOMINMAX;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) commons.hpp @@ -125,4 +125,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/XbmcThreads.vcxproj.filters b/project/VS2010Express/XbmcThreads.vcxproj.filters index 81780ba2eb..ba6170653d 100644 --- a/project/VS2010Express/XbmcThreads.vcxproj.filters +++ b/project/VS2010Express/XbmcThreads.vcxproj.filters @@ -1,67 +1,67 @@  - - - - - - + + + + + + platform - + platform\win - + - - - - - - - - - - - - - + + + + + + + + + + + + + platform - + platform - + platform - + platform\win - + platform\win - + platform\win - - + + platform\win - + platform\win - + platform - + platform - + platform\win - + @@ -71,4 +71,4 @@ {260ff9eb-2873-4bb8-8694-81aad4e2fedc} - + \ No newline at end of file diff --git a/project/VS2010Express/test-XbmcThreads.vcxproj b/project/VS2010Express/test-XbmcThreads.vcxproj index 6650abd08e..34025ad2c7 100644 --- a/project/VS2010Express/test-XbmcThreads.vcxproj +++ b/project/VS2010Express/test-XbmcThreads.vcxproj @@ -64,7 +64,7 @@ Disabled - ..\..\src\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories) + ..\..\xbmc\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories) TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;D3D_DEBUG_INFO;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions) false Async @@ -113,7 +113,7 @@ Default Speed true - ..\..\src\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories) + ..\..\xbmc\;..\..\lib\UnitTest++\src;..\BuildDependencies\include\UnitTest++\;%(AdditionalIncludeDirectories) TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions) false false @@ -135,7 +135,7 @@ /MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions) UnitTest++.lib;%(AdditionalDependencies) $(OutDir)XBMC.exe - ..\..\lib\libSDL-WIN32\lib;..\..\src\cores\DSPlayer\Libs;%(AdditionalLibraryDirectories) + ..\..\lib\libSDL-WIN32\lib;..\..\xbmc\cores\DSPlayer\Libs;%(AdditionalLibraryDirectories) libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries) dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;%(DelayLoadDLLs) true @@ -155,14 +155,14 @@ - - - - - + + + + + - + @@ -181,4 +181,4 @@ - + \ No newline at end of file diff --git a/project/VS2010Express/test-XbmcThreads.vcxproj.filters b/project/VS2010Express/test-XbmcThreads.vcxproj.filters index 02e94d582b..1df93420d2 100644 --- a/project/VS2010Express/test-XbmcThreads.vcxproj.filters +++ b/project/VS2010Express/test-XbmcThreads.vcxproj.filters @@ -1,13 +1,13 @@  - - - - - + + + + + - + - + \ No newline at end of file diff --git a/project/cmake/scripts/common/prepare-env.cmake b/project/cmake/scripts/common/prepare-env.cmake index bd839ab910..c0b5217ac9 100644 --- a/project/cmake/scripts/common/prepare-env.cmake +++ b/project/cmake/scripts/common/prepare-env.cmake @@ -54,7 +54,7 @@ configure_file(${APP_ROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xb ### copy all the addon binding header files to include/kodi # parse addon-bindings.mk to get the list of header files to copy -file(STRINGS ${APP_ROOT}/src/addons/addon-bindings.mk bindings) +file(STRINGS ${APP_ROOT}/xbmc/addons/addon-bindings.mk bindings) string(REPLACE "\n" ";" bindings "${bindings}") foreach(binding ${bindings}) string(REPLACE " =" ";" binding "${binding}") @@ -74,4 +74,4 @@ foreach(binding ${bindings}) #warning DEPRECATION_WARNING #endif #include \"kodi/${headerfile}\"") -endforeach() +endforeach() \ No newline at end of file diff --git a/src/ApplicationMessenger.cpp b/src/ApplicationMessenger.cpp index 310152b06d..2f4d6517bc 100644 --- a/src/ApplicationMessenger.cpp +++ b/src/ApplicationMessenger.cpp @@ -70,7 +70,7 @@ #include "utils/GlobalsHandling.h" #if defined(TARGET_ANDROID) - #include "src/android/activity/XBMCApp.h" + #include "xbmc/android/activity/XBMCApp.h" #endif using namespace PVR; diff --git a/src/addons/addon-bindings.mk b/src/addons/addon-bindings.mk index 75e0ddb416..50d75bcadf 100644 --- a/src/addons/addon-bindings.mk +++ b/src/addons/addon-bindings.mk @@ -1,20 +1,20 @@ -BINDINGS =src/addons/include/xbmc_addon_cpp_dll.h -BINDINGS+=src/addons/include/xbmc_addon_dll.h -BINDINGS+=src/addons/include/xbmc_addon_types.h -BINDINGS+=src/addons/include/xbmc_audioenc_dll.h -BINDINGS+=src/addons/include/xbmc_audioenc_types.h -BINDINGS+=src/addons/include/xbmc_codec_types.h -BINDINGS+=src/addons/include/xbmc_epg_types.h -BINDINGS+=src/addons/include/xbmc_pvr_dll.h -BINDINGS+=src/addons/include/xbmc_pvr_types.h -BINDINGS+=src/addons/include/xbmc_scr_dll.h -BINDINGS+=src/addons/include/xbmc_scr_types.h -BINDINGS+=src/addons/include/xbmc_vis_dll.h -BINDINGS+=src/addons/include/xbmc_vis_types.h -BINDINGS+=src/addons/include/xbmc_stream_utils.hpp +BINDINGS =xbmc/addons/include/xbmc_addon_cpp_dll.h +BINDINGS+=xbmc/addons/include/xbmc_addon_dll.h +BINDINGS+=xbmc/addons/include/xbmc_addon_types.h +BINDINGS+=xbmc/addons/include/xbmc_audioenc_dll.h +BINDINGS+=xbmc/addons/include/xbmc_audioenc_types.h +BINDINGS+=xbmc/addons/include/xbmc_codec_types.h +BINDINGS+=xbmc/addons/include/xbmc_epg_types.h +BINDINGS+=xbmc/addons/include/xbmc_pvr_dll.h +BINDINGS+=xbmc/addons/include/xbmc_pvr_types.h +BINDINGS+=xbmc/addons/include/xbmc_scr_dll.h +BINDINGS+=xbmc/addons/include/xbmc_scr_types.h +BINDINGS+=xbmc/addons/include/xbmc_vis_dll.h +BINDINGS+=xbmc/addons/include/xbmc_vis_types.h +BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h BINDINGS+=addons/library.xbmc.gui/libXBMC_gui.h BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h -BINDINGS+=src/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h +BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h diff --git a/src/cores/AudioEngine/Makefile.in b/src/cores/AudioEngine/Makefile.in index b48b20f04f..8491050434 100644 --- a/src/cores/AudioEngine/Makefile.in +++ b/src/cores/AudioEngine/Makefile.in @@ -1,13 +1,13 @@ ARCH=@ARCH@ INCLUDES = -I. -INCLUDES += -I@abs_top_srcdir@/src -INCLUDES += -I@abs_top_srcdir@/src/linux -INCLUDES += -I@abs_top_srcdir@/src/utils -INCLUDES += -I@abs_top_srcdir@/src/guilib -INCLUDES += -I@abs_top_srcdir@/src/cores -INCLUDES += -I@abs_top_srcdir@/src/cores/dvdplayer -INCLUDES += -I@abs_top_srcdir@/src/cores/dvdplayer/Codecs/ffmpeg +INCLUDES += -I@abs_top_srcdir@/xbmc +INCLUDES += -I@abs_top_srcdir@/xbmc/linux +INCLUDES += -I@abs_top_srcdir@/xbmc/utils +INCLUDES += -I@abs_top_srcdir@/xbmc/guilib +INCLUDES += -I@abs_top_srcdir@/xbmc/cores +INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer +INCLUDES += -I@abs_top_srcdir@/xbmc/cores/dvdplayer/Codecs/ffmpeg OSSLIBDIR=0 -include /etc/oss.conf diff --git a/src/cores/VideoRenderers/LinuxRendererGLES.cpp b/src/cores/VideoRenderers/LinuxRendererGLES.cpp index 0c4ccec509..81fe19b063 100644 --- a/src/cores/VideoRenderers/LinuxRendererGLES.cpp +++ b/src/cores/VideoRenderers/LinuxRendererGLES.cpp @@ -48,7 +48,7 @@ #include "threads/SingleLock.h" #include "RenderCapture.h" #include "RenderFormats.h" -#include "src/Application.h" +#include "xbmc/Application.h" #include "cores/IPlayer.h" extern "C" { diff --git a/src/cores/VideoRenderers/LinuxRendererGLES.h b/src/cores/VideoRenderers/LinuxRendererGLES.h index 7b47c2b7e6..d8bf35dfda 100644 --- a/src/cores/VideoRenderers/LinuxRendererGLES.h +++ b/src/cores/VideoRenderers/LinuxRendererGLES.h @@ -25,14 +25,14 @@ #include "system_gl.h" -#include "src/guilib/FrameBufferObject.h" -#include "src/guilib/Shader.h" +#include "xbmc/guilib/FrameBufferObject.h" +#include "xbmc/guilib/Shader.h" #include "settings/VideoSettings.h" #include "RenderFlags.h" #include "RenderFormats.h" #include "guilib/GraphicContext.h" #include "BaseRenderer.h" -#include "src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h" +#include "xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h" class CRenderCapture; diff --git a/src/cores/VideoRenderers/MMALRenderer.cpp b/src/cores/VideoRenderers/MMALRenderer.cpp index a5b26180cb..03a05dec86 100644 --- a/src/cores/VideoRenderers/MMALRenderer.cpp +++ b/src/cores/VideoRenderers/MMALRenderer.cpp @@ -31,7 +31,7 @@ #include "utils/MathUtils.h" #include "windowing/WindowingFactory.h" #include "cores/dvdplayer/DVDCodecs/Video/MMALCodec.h" -#include "src/Application.h" +#include "xbmc/Application.h" #define CLASSNAME "CMMALRenderer" diff --git a/src/cores/VideoRenderers/RenderCapture.h b/src/cores/VideoRenderers/RenderCapture.h index b8a65adb83..56d269ae1c 100644 --- a/src/cores/VideoRenderers/RenderCapture.h +++ b/src/cores/VideoRenderers/RenderCapture.h @@ -173,7 +173,7 @@ class CRenderCaptureBase }; #if defined(TARGET_RASPBERRY_PI) -#include "src/linux/RBP.h" +#include "xbmc/linux/RBP.h" class CRenderCaptureDispmanX : public CRenderCaptureBase { diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in b/src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in index 7c92c31126..6446ee94cf 100644 --- a/src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in +++ b/src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer CXXFLAGS+=-DHAVE_MMX diff --git a/src/cores/dvdplayer/DVDCodecs/Makefile.in b/src/cores/dvdplayer/DVDCodecs/Makefile.in index d2290d5872..ed183d8613 100644 --- a/src/cores/dvdplayer/DVDCodecs/Makefile.in +++ b/src/cores/dvdplayer/DVDCodecs/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer SRCS = DVDCodecUtils.cpp SRCS += DVDFactoryCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in b/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in index 3ed7f8a259..9e9c56fe54 100644 --- a/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in +++ b/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer SRCS = DVDOverlayCodec.cpp SRCS += DVDOverlayCodecCC.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h b/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h index e1119cdc34..b4aa571018 100644 --- a/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h +++ b/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h @@ -31,7 +31,7 @@ #include "cores/dvdplayer/DVDStreamInfo.h" #include "DVDVideoCodec.h" #include "threads/Event.h" -#include "src/settings/VideoSettings.h" +#include "xbmc/settings/VideoSettings.h" #include #include diff --git a/src/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/src/cores/dvdplayer/DVDCodecs/Video/Makefile.in index eecec72872..6f5d3e8183 100644 --- a/src/cores/dvdplayer/DVDCodecs/Video/Makefile.in +++ b/src/cores/dvdplayer/DVDCodecs/Video/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer SRCS = DVDVideoCodec.cpp SRCS += DVDVideoCodecFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp b/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp index 1969483c35..0f2cab0fda 100644 --- a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp +++ b/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp @@ -38,7 +38,7 @@ #include "settings/AdvancedSettings.h" #include "android/jni/Build.h" -#include "src/guilib/FrameBufferObject.h" +#include "xbmc/guilib/FrameBufferObject.h" #include #include diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h b/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h index 83b03021f3..ebd19ce45d 100644 --- a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h +++ b/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h @@ -21,7 +21,7 @@ /***************************************************************************/ #include "threads/Thread.h" -#include "src/guilib/FrameBufferObject.h" +#include "xbmc/guilib/FrameBufferObject.h" #include "cores/VideoRenderers/RenderFormats.h" #include diff --git a/src/cores/dvdplayer/DVDDemuxers/Makefile.in b/src/cores/dvdplayer/DVDDemuxers/Makefile.in index 511d746201..658c451ee2 100644 --- a/src/cores/dvdplayer/DVDDemuxers/Makefile.in +++ b/src/cores/dvdplayer/DVDDemuxers/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer SRCS = DVDDemux.cpp SRCS += DVDDemuxBXA.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp b/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp index 6bfbcae929..72b6eaffe0 100644 --- a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp +++ b/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp @@ -19,7 +19,7 @@ */ #include "DVDInputStreamFFmpeg.h" -#include "src/playlists/PlayListM3U.h" +#include "xbmc/playlists/PlayListM3U.h" #include "settings/Settings.h" #include "Util.h" #include "utils/log.h" diff --git a/src/cores/dvdplayer/DVDPlayer.cpp b/src/cores/dvdplayer/DVDPlayer.cpp index 86b97a1d53..a9bab4cc69 100644 --- a/src/cores/dvdplayer/DVDPlayer.cpp +++ b/src/cores/dvdplayer/DVDPlayer.cpp @@ -57,7 +57,7 @@ #include "cores/VideoRenderers/RenderManager.h" #endif #ifdef HAS_PERFORMANCE_SAMPLE -#include "src/utils/PerformanceSample.h" +#include "xbmc/utils/PerformanceSample.h" #else #define MEASURE_FUNCTION #endif @@ -78,7 +78,7 @@ #include "storage/MediaManager.h" #include "dialogs/GUIDialogBusy.h" #include "dialogs/GUIDialogKaiToast.h" -#include "src/playlists/PlayListM3U.h" +#include "xbmc/playlists/PlayListM3U.h" #include "utils/StringUtils.h" #include "Util.h" #include "LangInfo.h" diff --git a/src/cores/dvdplayer/DVDSubtitles/Makefile.in b/src/cores/dvdplayer/DVDSubtitles/Makefile.in index 3b5d777c30..7fc91aabf1 100644 --- a/src/cores/dvdplayer/DVDSubtitles/Makefile.in +++ b/src/cores/dvdplayer/DVDSubtitles/Makefile.in @@ -1,4 +1,4 @@ -INCLUDES+=-I@abs_top_srcdir@/src/cores/dvdplayer +INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer SRCS = DVDFactorySubtitle.cpp SRCS += DVDSubtitleLineCollection.cpp diff --git a/src/cores/omxplayer/OMXPlayerAudio.h b/src/cores/omxplayer/OMXPlayerAudio.h index 14b5c75082..2397db4753 100644 --- a/src/cores/omxplayer/OMXPlayerAudio.h +++ b/src/cores/omxplayer/OMXPlayerAudio.h @@ -34,7 +34,7 @@ #include "DVDDemuxers/DVDDemux.h" #include "DVDMessageQueue.h" #include "utils/BitstreamStats.h" -#include "src/linux/DllBCM.h" +#include "xbmc/linux/DllBCM.h" class OMXPlayerAudio : public CThread, public IDVDStreamPlayerAudio { diff --git a/src/cores/omxplayer/OMXVideo.cpp b/src/cores/omxplayer/OMXVideo.cpp index 27157fe2ee..99bb7eb15f 100644 --- a/src/cores/omxplayer/OMXVideo.cpp +++ b/src/cores/omxplayer/OMXVideo.cpp @@ -32,7 +32,7 @@ #include "settings/AdvancedSettings.h" #include "settings/MediaSettings.h" #include "cores/VideoRenderers/RenderManager.h" -#include "src/guilib/GraphicContext.h" +#include "xbmc/guilib/GraphicContext.h" #include "settings/Settings.h" #include "utils/BitstreamConverter.h" diff --git a/src/cores/omxplayer/OMXVideo.h b/src/cores/omxplayer/OMXVideo.h index f850f04335..c8fd5fbce4 100644 --- a/src/cores/omxplayer/OMXVideo.h +++ b/src/cores/omxplayer/OMXVideo.h @@ -30,9 +30,9 @@ #include "guilib/Geometry.h" #include "DVDDemuxers/DVDDemux.h" -#include "src/settings/VideoSettings.h" +#include "xbmc/settings/VideoSettings.h" #include "threads/CriticalSection.h" -#include "src/rendering/RenderSystem.h" +#include "xbmc/rendering/RenderSystem.h" #include #define VIDEO_BUFFERS 60 diff --git a/src/filesystem/AndroidAppDirectory.cpp b/src/filesystem/AndroidAppDirectory.cpp index cd6c82e6f6..b1a07b793c 100644 --- a/src/filesystem/AndroidAppDirectory.cpp +++ b/src/filesystem/AndroidAppDirectory.cpp @@ -22,7 +22,7 @@ #if defined(TARGET_ANDROID) #include "AndroidAppDirectory.h" -#include "src/android/activity/XBMCApp.h" +#include "xbmc/android/activity/XBMCApp.h" #include "FileItem.h" #include "File.h" #include "utils/URIUtils.h" diff --git a/src/guilib/GUIStaticItem.h b/src/guilib/GUIStaticItem.h index 747dc96689..098d8e1eb7 100644 --- a/src/guilib/GUIStaticItem.h +++ b/src/guilib/GUIStaticItem.h @@ -26,7 +26,7 @@ */ #include "GUIInfoTypes.h" -#include "src/FileItem.h" +#include "xbmc/FileItem.h" #include "GUIAction.h" class TiXmlElement; diff --git a/src/interfaces/python/Makefile.in b/src/interfaces/python/Makefile.in index 55eb77ae0b..e137ef071f 100644 --- a/src/interfaces/python/Makefile.in +++ b/src/interfaces/python/Makefile.in @@ -3,7 +3,7 @@ DOXYGEN=@DOXYGEN_EXE@ endif TOPDIR = @abs_top_srcdir@ -INTERFACES_DIR = @abs_top_srcdir@/src/interfaces +INTERFACES_DIR = @abs_top_srcdir@/xbmc/interfaces JAVA=@JAVA_EXE@ SWIG=@SWIG_EXE@ LIB=python_binding.a diff --git a/src/linux/OMXCore.cpp b/src/linux/OMXCore.cpp index ed044f3b19..4ae29ba998 100644 --- a/src/linux/OMXCore.cpp +++ b/src/linux/OMXCore.cpp @@ -32,7 +32,7 @@ #include "utils/log.h" #include "OMXClock.h" -#include "src/linux/RBP.h" +#include "xbmc/linux/RBP.h" #ifdef TARGET_LINUX #include "XMemUtils.h" diff --git a/src/network/upnp/UPnPServer.cpp b/src/network/upnp/UPnPServer.cpp index 0c179af69a..20e3bf5ab2 100644 --- a/src/network/upnp/UPnPServer.cpp +++ b/src/network/upnp/UPnPServer.cpp @@ -43,7 +43,7 @@ #include "music/MusicDatabase.h" #include "video/VideoDatabase.h" #include "guilib/GUIWindowManager.h" -#include "src/GUIUserMessages.h" +#include "xbmc/GUIUserMessages.h" #include "utils/FileUtils.h" NPT_SET_LOCAL_LOGGER("xbmc.upnp.server") diff --git a/src/osx/IOSEAGLView.mm b/src/osx/IOSEAGLView.mm index b23d7284b4..50cdf80986 100644 --- a/src/osx/IOSEAGLView.mm +++ b/src/osx/IOSEAGLView.mm @@ -45,9 +45,9 @@ #import #import "IOSEAGLView.h" #if defined(TARGET_DARWIN_IOS_ATV2) -#import "src/osx/atv2/KodiController.h" +#import "xbmc/osx/atv2/KodiController.h" #elif defined(TARGET_DARWIN_IOS) -#import "src/osx/ios/XBMCController.h" +#import "xbmc/osx/ios/XBMCController.h" #endif #import "IOSScreenManager.h" #import "AutoPool.h" diff --git a/src/osx/IOSScreenManager.mm b/src/osx/IOSScreenManager.mm index 328aad0ca1..f27d58cab5 100644 --- a/src/osx/IOSScreenManager.mm +++ b/src/osx/IOSScreenManager.mm @@ -38,9 +38,9 @@ #import "IOSScreenManager.h" #if defined(TARGET_DARWIN_IOS_ATV2) -#import "src/osx/atv2/KodiController.h" +#import "xbmc/osx/atv2/KodiController.h" #elif defined(TARGET_DARWIN_IOS) -#import "src/osx/ios/XBMCController.h" +#import "xbmc/osx/ios/XBMCController.h" #endif #import "IOSExternalTouchController.h" #import "IOSEAGLView.h" diff --git a/src/osx/Makefile.in b/src/osx/Makefile.in index b4f5e7957e..5a8e861190 100644 --- a/src/osx/Makefile.in +++ b/src/osx/Makefile.in @@ -1,6 +1,6 @@ INCLUDES = -I@abs_top_srcdir@ -INCLUDES += -I@abs_top_srcdir@/src -INCLUDES += -I@abs_top_srcdir@/src/linux +INCLUDES += -I@abs_top_srcdir@/xbmc +INCLUDES += -I@abs_top_srcdir@/xbmc/linux .SUFFIXES : .m .mm diff --git a/src/pvr/channels/PVRChannel.h b/src/pvr/channels/PVRChannel.h index f7650d80a0..63a16a1177 100644 --- a/src/pvr/channels/PVRChannel.h +++ b/src/pvr/channels/PVRChannel.h @@ -299,7 +299,7 @@ namespace PVR * * The stream input type * If it is empty, ffmpeg will try to scan the stream to find the right input format. - * See "src/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a + * See "xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/allformats.c" for a * list of the input formats. * * @return The stream input type diff --git a/src/rendering/gles/RenderSystemGLES.h b/src/rendering/gles/RenderSystemGLES.h index a8b83d76b9..98e398ae89 100644 --- a/src/rendering/gles/RenderSystemGLES.h +++ b/src/rendering/gles/RenderSystemGLES.h @@ -26,7 +26,7 @@ #include "system.h" #include "system_gl.h" #include "rendering/RenderSystem.h" -#include "src/guilib/GUIShader.h" +#include "xbmc/guilib/GUIShader.h" enum ESHADERMETHOD { diff --git a/src/utils/Screenshot.cpp b/src/utils/Screenshot.cpp index ee60a14143..db73d4aa0b 100644 --- a/src/utils/Screenshot.cpp +++ b/src/utils/Screenshot.cpp @@ -30,7 +30,7 @@ #include "pictures/Picture.h" #ifdef TARGET_RASPBERRY_PI -#include "src/linux/RBP.h" +#include "xbmc/linux/RBP.h" #endif #ifdef HAS_VIDEO_PLAYBACK diff --git a/src/visualizations/Goom/Makefile.in b/src/visualizations/Goom/Makefile.in index a172e670b0..e307d71d3c 100644 --- a/src/visualizations/Goom/Makefile.in +++ b/src/visualizations/Goom/Makefile.in @@ -9,9 +9,9 @@ DISTCLEAN_FILES=../../../addons/visualization.goom $(SLIB): $(OBJS) goom2k4-0/src/.libs/libgoom2.a ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined suppress -read_only_relocs suppress -o $(SLIB) \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o goom2k4-0/src/.libs/libgoom2.a $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o goom2k4-0/src/.libs/libgoom2.a $(OBJS) else $(CXX) $(LDFLAGS) -fPIC goom2k4-0/src/*.o -shared $(CXXFLAGS) -o $(SLIB) $(OBJS) \ `cat ../../cores/DllLoader/exports/wrapper.def` \ diff --git a/src/visualizations/OpenGLSpectrum/Makefile.in b/src/visualizations/OpenGLSpectrum/Makefile.in index 5e4708298c..b9f290330f 100644 --- a/src/visualizations/OpenGLSpectrum/Makefile.in +++ b/src/visualizations/OpenGLSpectrum/Makefile.in @@ -9,8 +9,8 @@ OBJS = opengl_spectrum.o ifeq (@USE_OPENGLES@,1) DEFINES += -DHAS_GLES=2 - INCLUDES+= -I@abs_top_srcdir@/src/visualizations/EGLHelpers - OBJS += @abs_top_srcdir@/src/visualizations/EGLHelpers/eglhelpers.a + INCLUDES+= -I@abs_top_srcdir@/xbmc/visualizations/EGLHelpers + OBJS += @abs_top_srcdir@/xbmc/visualizations/EGLHelpers/eglhelpers.a ifeq ($(findstring osx,$(ARCH)), osx) LDFLAGS += -framework OpenGLES else diff --git a/src/visualizations/WaveForm/Makefile.in b/src/visualizations/WaveForm/Makefile.in index 2f408dd3bd..98117cfffc 100644 --- a/src/visualizations/WaveForm/Makefile.in +++ b/src/visualizations/WaveForm/Makefile.in @@ -9,9 +9,9 @@ endif ifeq (@USE_OPENGLES@,1) DEFINES += -DHAS_GLES=2 - INCLUDES+= -I@abs_top_srcdir@/src/visualizations/EGLHelpers + INCLUDES+= -I@abs_top_srcdir@/xbmc/visualizations/EGLHelpers OBJS = Main_gles.o - OBJS += @abs_top_srcdir@/src/visualizations/EGLHelpers/eglhelpers.a + OBJS += @abs_top_srcdir@/xbmc/visualizations/EGLHelpers/eglhelpers.a ifeq ($(findstring osx,$(ARCH)), osx) LDFLAGS += -framework OpenGLES else diff --git a/src/visualizations/WaveForm/Waveform.vcxproj b/src/visualizations/WaveForm/Waveform.vcxproj index 8dee2ca0e0..c6bec1d55a 100644 --- a/src/visualizations/WaveForm/Waveform.vcxproj +++ b/src/visualizations/WaveForm/Waveform.vcxproj @@ -50,8 +50,8 @@ .vis Waveform_win32 Waveform_win32 - $(SolutionDir)\..\..\src;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath) - $(SolutionDir)\..\..\src;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath) + $(SolutionDir)\..\..\xbmc;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath) + $(SolutionDir)\..\..\xbmc;$(SolutionDir)\..\BuildDependencies\include;$(IncludePath) diff --git a/src/visualizations/XBMCProjectM/Makefile.in b/src/visualizations/XBMCProjectM/Makefile.in index 2fbbca047b..249338c9c1 100644 --- a/src/visualizations/XBMCProjectM/Makefile.in +++ b/src/visualizations/XBMCProjectM/Makefile.in @@ -10,16 +10,16 @@ ifeq ($(findstring osx,$(ARCH)), osx) CXXFLAGS+=-fno-common $(SLIB): $(OBJS) libprojectM/libprojectM.dylib - $(CXX) $(CFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/src/cores/DllLoader/exports/wrapper_mach_alias \ + $(CXX) $(CFLAGS) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $(SLIB) \ - @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o ./libprojectM/CMakeFiles/projectM.dir/*.o $(OBJS) + @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o ./libprojectM/CMakeFiles/projectM.dir/*.o $(OBJS) $(MAKE) $(PRESETS) libprojectM/libprojectM.dylib: $(MAKE) -C libprojectM else $(SLIB): $(OBJS) libprojectM/libprojectM.so - $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/src/cores/DllLoader/exports/wrapper.o + $(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(MAKE) $(PRESETS) libprojectM/libprojectM.so: diff --git a/src/windowing/WinEventsWayland.cpp b/src/windowing/WinEventsWayland.cpp index 2885f5f3c1..d46870cbde 100644 --- a/src/windowing/WinEventsWayland.cpp +++ b/src/windowing/WinEventsWayland.cpp @@ -24,7 +24,7 @@ #include #include "Application.h" -#include "src/windowing/WindowingFactory.h" +#include "xbmc/windowing/WindowingFactory.h" #include "WinEventsWayland.h" #include "wayland/EventListener.h" diff --git a/src/windowing/X11/XRandR.cpp b/src/windowing/X11/XRandR.cpp index 4dfa87013d..0a3cdeec8b 100644 --- a/src/windowing/X11/XRandR.cpp +++ b/src/windowing/X11/XRandR.cpp @@ -28,7 +28,7 @@ #include "PlatformInclude.h" #include "utils/XBMCTinyXML.h" #include "utils/StringUtils.h" -#include "../src/utils/log.h" +#include "../xbmc/utils/log.h" #include "threads/SystemClock.h" #include "CompileInfo.h" diff --git a/src/windows/GUIMediaWindow.cpp b/src/windows/GUIMediaWindow.cpp index 5e6aeb0911..fb004efa74 100644 --- a/src/windows/GUIMediaWindow.cpp +++ b/src/windows/GUIMediaWindow.cpp @@ -68,7 +68,7 @@ #include "dialogs/GUIDialogMediaFilter.h" #include "filesystem/SmartPlaylistDirectory.h" #if defined(TARGET_ANDROID) -#include "src/android/activity/XBMCApp.h" +#include "xbmc/android/activity/XBMCApp.h" #endif #include "FileItemListModification.h" diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in index 3f2e3bb5ed..4f0b610211 100644 --- a/tools/TexturePacker/Makefile.in +++ b/tools/TexturePacker/Makefile.in @@ -8,7 +8,7 @@ SRCS = \ SDL_anigif.cpp \ XBTFWriter.cpp \ XBMCTex.cpp \ - @abs_top_srcdir@/src/guilib/XBTF.cpp + @abs_top_srcdir@/xbmc/guilib/XBTF.cpp TARGET = TexturePacker CLEAN_FILES = $(TARGET) @@ -16,8 +16,8 @@ CLEAN_FILES = $(TARGET) CXXFLAGS_FOR_BUILD += \ -I. \ -I@abs_top_srcdir@/lib \ - -I@abs_top_srcdir@/src \ - -I@abs_top_srcdir@/src/linux + -I@abs_top_srcdir@/xbmc \ + -I@abs_top_srcdir@/xbmc/linux LDFLAGS_FOR_BUILD += -lSDL_image -lSDL -llzo2 LDFLAGS_FOR_BUILD += -L@abs_top_srcdir@/lib/libsquish -lsquish-native @@ -29,7 +29,7 @@ endif all: $(TARGET) -$(TARGET): $(SRCS) @abs_top_srcdir@/src/guilib/XBTF.h +$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h # TexturePacker run native on build system, build it with native tools make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET) diff --git a/tools/TexturePacker/Win32/MakeDDS.vcxproj b/tools/TexturePacker/Win32/MakeDDS.vcxproj index 91584a2cf5..35f15ae103 100644 --- a/tools/TexturePacker/Win32/MakeDDS.vcxproj +++ b/tools/TexturePacker/Win32/MakeDDS.vcxproj @@ -47,7 +47,7 @@ Disabled - ..;..\..\..\src\win32;..\..\..\src\guilib;..\..\..\src;..\..\..\src\lib\libsquish;%(AdditionalIncludeDirectories) + ..;..\..\..\xbmc\win32;..\..\..\xbmc\guilib;..\..\..\xbmc;..\..\..\xbmc\lib\libsquish;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;NO_XBMC_FILESYSTEM;%(PreprocessorDefinitions) true EnableFastChecks @@ -58,7 +58,7 @@ EditAndContinue - SDL.lib;SDL_image.lib;..\..\..\lib\libsquish\lib\squishd.lib;%(AdditionalDependencies) + SDL.lib;SDL_image.lib;..\..\..\xbmc\lib\libsquish\lib\squishd.lib;%(AdditionalDependencies) true Console MachineX86 @@ -68,7 +68,7 @@ MaxSpeed true - ..;..\..\..\src\win32;..\..\..\src\guilib;..\..\..\src;..\..\..\lib\libsquish;%(AdditionalIncludeDirectories) + ..;..\..\..\xbmc\win32;..\..\..\xbmc\guilib;..\..\..\xbmc;..\..\..\xbmc\lib\libsquish;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;NO_XBMC_FILESYSTEM;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -78,7 +78,7 @@ ProgramDatabase - SDL.lib;SDL_image.lib;..\..\..\lib\libsquish\lib\squish.lib;%(AdditionalDependencies) + SDL.lib;SDL_image.lib;..\..\..\xbmc\lib\libsquish\lib\squish.lib;%(AdditionalDependencies) true Console true @@ -87,11 +87,11 @@ - + - + @@ -99,4 +99,4 @@ - + \ No newline at end of file diff --git a/tools/TexturePacker/Win32/MakeDDS.vcxproj.filters b/tools/TexturePacker/Win32/MakeDDS.vcxproj.filters index 4a2ca07006..134d242959 100644 --- a/tools/TexturePacker/Win32/MakeDDS.vcxproj.filters +++ b/tools/TexturePacker/Win32/MakeDDS.vcxproj.filters @@ -15,7 +15,7 @@ - + Source Files @@ -23,7 +23,7 @@ - + Header Files diff --git a/tools/TexturePacker/Win32/TexturePacker.vcxproj b/tools/TexturePacker/Win32/TexturePacker.vcxproj index ff39345dd9..900a833144 100644 --- a/tools/TexturePacker/Win32/TexturePacker.vcxproj +++ b/tools/TexturePacker/Win32/TexturePacker.vcxproj @@ -51,7 +51,7 @@ Disabled - .;..\..\..\src;..\..\..\lib;..\..\..\src\win32%(AdditionalIncludeDirectories) + .;..\..\..\xbmc;..\..\..\lib;..\..\..\xbmc\win32%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -73,7 +73,7 @@ MaxSpeed true - .;..\..\..\src;..\..\..\lib;..\..\..\src\win32%(AdditionalIncludeDirectories) + .;..\..\..\xbmc;..\..\..\lib;..\..\..\xbmc\win32%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;USE_LZO_PACKING;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -97,7 +97,7 @@ - + @@ -105,7 +105,7 @@ - + diff --git a/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters b/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters index 3b544860c7..b212ae080f 100644 --- a/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters +++ b/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters @@ -21,7 +21,7 @@ Source Files - + Source Files @@ -47,7 +47,7 @@ Header Files - + Header Files diff --git a/tools/codegenerator/GenerateSWIGBindings.bat b/tools/codegenerator/GenerateSWIGBindings.bat index 332df8316a..da45bdb809 100644 --- a/tools/codegenerator/GenerateSWIGBindings.bat +++ b/tools/codegenerator/GenerateSWIGBindings.bat @@ -8,7 +8,7 @@ SET generator_dir=%base_dir%\tools\codegenerator SET bin_dir=%cur_dir%\..\BuildDependencies\bin SET java_exe=java.exe -rem go into src/interfaces/python +rem go into xbmc/interfaces/python cd "%1\..\python" SET python_dir=%CD% @@ -27,7 +27,7 @@ rem run doxygen "%bin_dir%\doxygen\doxygen.exe" > NUL 2>&1 rem run swig to generate the XML used by groovy to generate the python bindings -"%bin_dir%\swig\swig.exe" -w401 -c++ -outdir "%python_generated_dir%" -o "%python_generated_dir%\%2.xml" -xml -I"%base_Dir%\src" -xmllang python "%swig_dir%\%2.i" +"%bin_dir%\swig\swig.exe" -w401 -c++ -outdir "%python_generated_dir%" -o "%python_generated_dir%\%2.xml" -xml -I"%base_Dir%\xbmc" -xmllang python "%swig_dir%\%2.i" rem run groovy to generate the python bindings "%java_exe%" -cp "%groovy_dir%\groovy-all-2.1.7.jar;%groovy_dir%\commons-lang-2.6.jar;%generator_dir%;%python_dir%" groovy.ui.GroovyMain "%generator_dir%\Generator.groovy" "%python_generated_dir%\%2.xml" "%python_dir%\PythonSwig.cpp.template" "%python_generated_dir%\%2.cpp" "%doxygen_dir%" diff --git a/tools/darwin/Configurations/App.xcconfig.in b/tools/darwin/Configurations/App.xcconfig.in index 767506040c..936815c921 100644 --- a/tools/darwin/Configurations/App.xcconfig.in +++ b/tools/darwin/Configurations/App.xcconfig.in @@ -20,9 +20,9 @@ XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@ -HEADER_SEARCH_PATHS = $(inherited) $SRCROOT src src/linux src/osx src/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6 +HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6 -LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/libsquish $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/src/interfaces/json-rpc "$(SRCROOT)/src/interfaces/python" "$(SRCROOT)/src/interfaces/legacy" +LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/libsquish $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy" FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/" XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.6 -lyajl -ljpeg -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt diff --git a/tools/darwin/Support/CopyRootFiles-atv2.command b/tools/darwin/Support/CopyRootFiles-atv2.command index bc347a6b36..3ebb6ab668 100755 --- a/tools/darwin/Support/CopyRootFiles-atv2.command +++ b/tools/darwin/Support/CopyRootFiles-atv2.command @@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" ${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" ${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command index e24379a318..81bccd6ceb 100755 --- a/tools/darwin/Support/CopyRootFiles-ios.command +++ b/tools/darwin/Support/CopyRootFiles-ios.command @@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" ${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" ${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command index d004d368f6..8c10364cbe 100755 --- a/tools/darwin/Support/CopyRootFiles-osx.command +++ b/tools/darwin/Support/CopyRootFiles-osx.command @@ -31,7 +31,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darw mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" ${SYNC} "$SRCROOT/tools/darwin/runtime" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" ${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" diff --git a/tools/darwin/Support/copyframeworks-atv2.command b/tools/darwin/Support/copyframeworks-atv2.command index d0d35a05eb..21cdd55ff7 100755 --- a/tools/darwin/Support/copyframeworks-atv2.command +++ b/tools/darwin/Support/copyframeworks-atv2.command @@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/copyframeworks-ios.command b/tools/darwin/Support/copyframeworks-ios.command index 1dcc09f1e9..328258bd08 100755 --- a/tools/darwin/Support/copyframeworks-ios.command +++ b/tools/darwin/Support/copyframeworks-ios.command @@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/copyframeworks-osx.command b/tools/darwin/Support/copyframeworks-osx.command index 105c74f016..df041c1ab1 100755 --- a/tools/darwin/Support/copyframeworks-osx.command +++ b/tools/darwin/Support/copyframeworks-osx.command @@ -70,7 +70,7 @@ cp -f "$TARGET_BUILD_DIR/$APP_NAME" "$TARGET_BINARY" echo "Creating icon" iconutil -c icns --output "$TARGET_CONTENTS/Resources/kodi.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset" -cp -f "$SRCROOT/src/osx/Info.plist" "$TARGET_CONTENTS/" +cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/" # Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework echo "Checking $TARGET_BINARY dylib dependencies" @@ -102,8 +102,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/makepythoninterface.command b/tools/darwin/Support/makepythoninterface.command index d670659e60..ec2d2b42ef 100755 --- a/tools/darwin/Support/makepythoninterface.command +++ b/tools/darwin/Support/makepythoninterface.command @@ -8,5 +8,5 @@ fi if [ "$ACTION" = build ] ; then make -f ${SRCROOT}/codegenerator.mk - make -f ${SRCROOT}/src/gen-compileinfo.mk + make -f ${SRCROOT}/xbmc/gen-compileinfo.mk fi diff --git a/tools/windows/CompileInfo.bat b/tools/windows/CompileInfo.bat index 0ee40cdebe..ef8af0a36c 100644 --- a/tools/windows/CompileInfo.bat +++ b/tools/windows/CompileInfo.bat @@ -20,7 +20,7 @@ SET separator=, CALL SET file_version=%%addon_api:.=%separator%%%%separator%0 REM create the files with the proper version information -"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g "%base_dir%\src\CompileInfo.cpp.in" > "%base_dir%\src\CompileInfo.cpp" +"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g "%base_dir%\xbmc\CompileInfo.cpp.in" > "%base_dir%\xbmc\CompileInfo.cpp" "%msys_bin_dir%\sed.exe" s/@APP_ADDON_API@/%addon_api%/g "%base_dir%\addons\xbmc.addon\addon.xml.in" > "%base_dir%\addons\xbmc.addon\addon.xml" -"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g "%base_dir%\src\win32\XBMC_PC.rc.in" > "%base_dir%\src\win32\XBMC_PC.rc" +"%msys_bin_dir%\sed.exe" -e s/@APP_NAME@/%app_name%/g -e s/@COMPANY_NAME@/%company_name%/g -e s/@APP_VERSION_MAJOR@/%major%/g -e s/@APP_VERSION_MINOR@/%minor%/g -e s/@APP_VERSION_TAG@/%tag%/g -e s/@FILE_VERSION@/%file_version%/g "%base_dir%\xbmc\win32\XBMC_PC.rc.in" > "%base_dir%\xbmc\win32\XBMC_PC.rc" diff --git a/tools/windows/JsonSchemaBuilder.bat b/tools/windows/JsonSchemaBuilder.bat index 04db6df283..3e0b52e253 100644 --- a/tools/windows/JsonSchemaBuilder.bat +++ b/tools/windows/JsonSchemaBuilder.bat @@ -6,7 +6,7 @@ SET base_dir=%cur_dir%\..\.. SET builddeps_dir=%cur_dir%\..\BuildDependencies SET bin_dir=%builddeps_dir%\bin SET msys_bin_dir=%builddeps_dir%\msys\bin -SET jsonrpc_path=%base_dir%\src\interfaces\json-rpc +SET jsonrpc_path=%base_dir%\xbmc\interfaces\json-rpc SET jsonrpc_schema_path=%jsonrpc_path%\schema SET jsonrpc_output=ServiceDescription.h -- cgit v1.2.3