diff options
24 files changed, 186 insertions, 88 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index d3c7ded410..26915cb15f 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -7552,7 +7552,17 @@ msgctxt "#14210" msgid "Profile settings" msgstr "" -#empty strings from id 14211 to 14214 +#: system/settings/settings.xml +msgctxt "#14211" +msgid "Media" +msgstr "" + +#: system/settings/settings.xml +msgctxt "#14212" +msgid "Media settings" +msgstr "" + +#empty strings from id 14213 to 14214 #: system/settings/settings.xml msgctxt "#14215" @@ -7609,7 +7619,12 @@ msgctxt "#14225" msgid "Network Control" msgstr "" -#empty strings from id 14226 to 14229 +#: system/settings/settings.xml +msgctxt "#14226" +msgid "Manage Sources" +msgstr "" + +#empty strings from id 14227 to 14229 #: system/settings/settings.xml msgctxt "#14230" @@ -7641,7 +7656,17 @@ msgctxt "#14235" msgid "Download Services" msgstr "" -#empty strings from id 14236 to 14239 +#: system/settings/settings.xml +msgctxt "#14236" +msgid "Video Library" +msgstr "" + +#: system/settings/settings.xml +msgctxt "#14237" +msgid "Music Library" +msgstr "" + +#empty strings from id 14238 to 14239 #: system/settings/settings.xml msgctxt "#14240" @@ -7653,7 +7678,20 @@ msgctxt "#14241" msgid "Metadata" msgstr "" -#empty strings from id 14242 to 14244 +#: system/settings/settings.xml +msgctxt "#14242" +msgid "Videos..." +msgstr "" + +#: system/settings/settings.xml +msgctxt "#14243" +msgid "Music..." +msgstr "" + +#: system/settings/settings.xml +msgctxt "#14244" +msgid "Pictures..." +msgstr "" #: system/settings/settings.xml msgctxt "#14245" @@ -19306,10 +19344,10 @@ msgctxt "#38100" msgid "Section that contains the settings for the playback of media" msgstr "" -#. Description of section #14201 "Library" +#. Description of section #14201 "Media" #: system/settings/settings.xml msgctxt "#38101" -msgid "Section that contains the settings for how media information is collected, stored, shown, and navigated" +msgid "Section that contains the settings for sources and how media information is collected, stored, shown, and navigated" msgstr "" #. Description of section #14203 "Customise" @@ -19393,3 +19431,28 @@ msgstr "" msgctxt "#39003" msgid "Accelerate h264" msgstr "" + +#. Description of category "Library" with label #14202 +#: system/settings/settings.xml +msgctxt "#39004" +msgid "This category contains provides access to the windows for source management and the Library settings for the databases" +msgstr "" + +#. Description of setting "Videos... with label #14242 +#: system/settings/settings.xml +msgctxt "#39005" +msgid "This provides access to where video sources can be added and otherwise managed." +msgstr "" + +#. Description of setting "Music... with label #14243 +#: system/settings/settings.xml +msgctxt "#39006" +msgid "This provides access to where music sources can be added and otherwise managed." +msgstr "" + +#. Description of setting "Pictures... with label #14244 +#: system/settings/settings.xml +msgctxt "#39007" +msgid "This provides access to where picture sources can be added and otherwise managed." +msgstr "" + diff --git a/addons/skin.estouchy/language/resource.language.en_gb/strings.po b/addons/skin.estouchy/language/resource.language.en_gb/strings.po index fb745d9ecc..9e2afb58fe 100644 --- a/addons/skin.estouchy/language/resource.language.en_gb/strings.po +++ b/addons/skin.estouchy/language/resource.language.en_gb/strings.po @@ -244,7 +244,7 @@ msgid "Configure actions that can be used during playback · Configure how media msgstr "" msgctxt "#31409" -msgid "Configure how the media lists display content · Configure how library lists are navigated · Configure database options" +msgid "Configure library sources· Show the media lists display content · Configure how library lists are navigated" msgstr "" msgctxt "#31410" diff --git a/addons/skin.estouchy/xml/Settings.xml b/addons/skin.estouchy/xml/Settings.xml index f2a57a97c6..5469a4c17b 100644 --- a/addons/skin.estouchy/xml/Settings.xml +++ b/addons/skin.estouchy/xml/Settings.xml @@ -131,9 +131,9 @@ <icon>icon_settings_player.png</icon> </item> <item id="2"> - <label>14202</label> + <label>14211</label> <label2>31409</label2> - <onclick>ActivateWindow(LibrarySettings)</onclick> + <onclick>ActivateWindow(MediaSettings)</onclick> <icon>icon_settings_library.png</icon> </item> <item id="3"> diff --git a/addons/skin.estuary/1080i/Settings.xml b/addons/skin.estuary/1080i/Settings.xml index 06f9d539cb..ad1972a993 100644 --- a/addons/skin.estuary/1080i/Settings.xml +++ b/addons/skin.estuary/1080i/Settings.xml @@ -104,8 +104,8 @@ <icon>icons/settings/video.png</icon> </item> <item> - <label>$LOCALIZE[14203]</label> - <onclick>ActivateWindow(LibrarySettings)</onclick> + <label>$LOCALIZE[14212]</label> + <onclick>ActivateWindow(MediaSettings)</onclick> <icon>icons/settings/library.png</icon> </item> <item> diff --git a/lib/win32/Effects11/Effects11_2013.vcxproj b/lib/win32/Effects11/Effects11_2013.vcxproj index 75d8f51825..3cdc19d28f 100644 --- a/lib/win32/Effects11/Effects11_2013.vcxproj +++ b/lib/win32/Effects11/Effects11_2013.vcxproj @@ -31,7 +31,6 @@ <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> <RootNamespace>Effects11</RootNamespace> <Keyword>Win32Proj</Keyword> - <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> diff --git a/project/cmake/installdata/windows/python.txt b/project/cmake/installdata/windows/python.txt new file mode 100644 index 0000000000..b8053187cf --- /dev/null +++ b/project/cmake/installdata/windows/python.txt @@ -0,0 +1 @@ +system/python/*
\ No newline at end of file diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml index 9408133200..a9d1c65066 100644 --- a/system/keymaps/gamepad.xml +++ b/system/keymaps/gamepad.xml @@ -177,7 +177,7 @@ <B>Stop</B> <Y>Rotate</Y> <X>ZoomNormal</X> - <black>CodecInfo</black> + <black>Info</black> <white>Info</white> <righttrigger>NextPicture</righttrigger> <lefttrigger>PreviousPicture</lefttrigger> diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml index 516726d76a..6b7aa92e6a 100644 --- a/system/keymaps/joystick.xml +++ b/system/keymaps/joystick.xml @@ -141,7 +141,7 @@ <b>Stop</b> <y>ZoomNormal</y> <leftbumper>Rotate</leftbumper> - <rightbumper>CodecInfo</rightbumper> + <rightbumper>Info</rightbumper> <up>ZoomIn</up> <down>ZoomOut</down> <left>PreviousPicture</left> diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index c6b4e7d23e..90517afa61 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -441,7 +441,7 @@ <eight>ZoomLevel8</eight> <nine>ZoomLevel9</nine> <i>Info</i> - <o>PlayerProcessInfo</o> + <o>Info</o> <period>NextPicture</period> <comma>PreviousPicture</comma> <plus>ZoomIn</plus> diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml index 07f2654866..dedcc9bfd0 100644 --- a/system/keymaps/remote.xml +++ b/system/keymaps/remote.xml @@ -259,7 +259,7 @@ <seven>ZoomLevel7</seven> <eight>ZoomLevel8</eight> <nine>ZoomLevel9</nine> - <info>CodecInfo</info> + <info>Info</info> <skipplus>NextPicture</skipplus> <skipminus>PreviousPicture</skipminus> <title>Info</title> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 5d3bfc1e5d..3ab531e9d4 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -835,7 +835,71 @@ </group> </category> </section> - <section id="library" label="14202" help="38101"> + <section id="media" label="14211" help="38101"> + <category id="library" label="14202" help="39004"> + <group id="1" label="14226"> + <setting id="source.videos" type="action" label="14242" help="39005"> + <level>1</level> + <control type="button" format="action" /> + </setting> + <setting id="source.music" type="action" label="14243" help="39006"> + <level>1</level> + <control type="button" format="action" /> + </setting> + <setting id="source.pictures" type="action" label="14244" help="39007"> + <level>1</level> + <control type="button" format="action" /> + </setting> + </group> + <group id="2" label="14236"> + <setting id="videolibrary.updateonstartup" type="boolean" label="14245" help="36146"> + <level>1</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="videolibrary.backgroundupdate" type="boolean" label="14246" help="36147"> + <level>1</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="videolibrary.cleanup" type="action" label="14247" help="36148"> + <level>2</level> + <control type="button" format="action" /> + </setting> + <setting id="videolibrary.export" type="action" label="14248" help="36149"> + <level>2</level> + <control type="button" format="action" /> + </setting> + <setting id="videolibrary.import" type="action" label="14249" help="36150"> + <level>2</level> + <control type="button" format="action" /> + </setting> + </group> + <group id="3" label="14237"> + <setting id="musiclibrary.updateonstartup" type="boolean" label="14245" help="36259"> + <level>1</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="musiclibrary.backgroundupdate" type="boolean" label="14246" help="36147"> + <level>1</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="musiclibrary.cleanup" type="action" label="14247" help="36148"> + <level>2</level> + <control type="button" format="action" /> + </setting> + <setting id="musiclibrary.export" type="action" label="14248" help="36262"> + <level>2</level> + <control type="button" format="action" /> + </setting> + <setting id="musiclibrary.import" type="action" label="14249" help="36263"> + <level>2</level> + <control type="button" format="action" /> + </setting> + </group> + </category> <category id="filelists" label="16000" help="36121"> <group id="1" label="593"> <setting id="filelists.showparentdiritems" type="boolean" label="13306" help="36122"> @@ -1132,56 +1196,6 @@ </setting> </group> </category> - <category id="databases" label="14219" help="38110"> - <group id="1" label="14215"> - <setting id="videolibrary.updateonstartup" type="boolean" label="14245" help="36146"> - <level>1</level> - <default>false</default> - <control type="toggle" /> - </setting> - <setting id="videolibrary.backgroundupdate" type="boolean" label="14246" help="36147"> - <level>1</level> - <default>false</default> - <control type="toggle" /> - </setting> - <setting id="videolibrary.cleanup" type="action" label="14247" help="36148"> - <level>2</level> - <control type="button" format="action" /> - </setting> - <setting id="videolibrary.export" type="action" label="14248" help="36149"> - <level>2</level> - <control type="button" format="action" /> - </setting> - <setting id="videolibrary.import" type="action" label="14249" help="36150"> - <level>2</level> - <control type="button" format="action" /> - </setting> - </group> - <group id="2" label="14216"> - <setting id="musiclibrary.updateonstartup" type="boolean" label="14245" help="36259"> - <level>1</level> - <default>false</default> - <control type="toggle" /> - </setting> - <setting id="musiclibrary.backgroundupdate" type="boolean" label="14246" help="36147"> - <level>1</level> - <default>false</default> - <control type="toggle" /> - </setting> - <setting id="musiclibrary.cleanup" type="action" label="14247" help="36148"> - <level>2</level> - <control type="button" format="action" /> - </setting> - <setting id="musiclibrary.export" type="action" label="14248" help="36262"> - <level>2</level> - <control type="button" format="action" /> - </setting> - <setting id="musiclibrary.import" type="action" label="14249" help="36263"> - <level>2</level> - <control type="button" format="action" /> - </setting> - </group> - </category> <category id="scrapers" label="0" help="36197"> <visible>false</visible> <group id="1"> diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index edec0384a4..1c33cbba5a 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -1467,6 +1467,18 @@ void CApplication::OnSettingAction(const CSetting *setting) g_windowManager.ActivateWindow(WINDOW_SCREEN_CALIBRATION); else if (settingId == CSettings::SETTING_VIDEOSCREEN_TESTPATTERN) g_windowManager.ActivateWindow(WINDOW_TEST_PATTERN); + else if (settingId == CSettings::SETTING_SOURCE_VIDEOS) + { + std::vector<std::string> params{"library://video/files.xml", "return"}; + g_windowManager.ActivateWindow(WINDOW_VIDEO_NAV, params); + } + else if (settingId == CSettings::SETTING_SOURCE_MUSIC) + { + std::vector<std::string> params{"library://music/files.xml", "return"}; + g_windowManager.ActivateWindow(WINDOW_MUSIC_NAV, params); + } + else if (settingId == CSettings::SETTING_SOURCE_PICTURES) + g_windowManager.ActivateWindow(WINDOW_PICTURES); } bool CApplication::OnSettingUpdate(CSetting* &setting, const char *oldSettingId, const TiXmlNode *oldSettingNode) @@ -2362,15 +2374,6 @@ bool CApplication::OnAction(const CAction &action) g_windowManager.ActivateWindow(WINDOW_MUSIC_PLAYLIST); return true; } - if (action.GetID() == ACTION_PLAYER_PROCESS_INFO) - { - if (m_pPlayer->GetCurrentPlayer() == "VideoPlayer" && - g_windowManager.GetActiveWindow() != WINDOW_DIALOG_PLAYER_PROCESS_INFO) - { - g_windowManager.ActivateWindow(WINDOW_DIALOG_PLAYER_PROCESS_INFO); - return true; - } - } return false; } diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp index 4683852ba4..5bf0f9b6ce 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -4485,9 +4485,17 @@ bool CVideoPlayer::OnAction(const CAction &action) CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25011), g_localizeStrings.Get(m_SkipCommercials ? 25013 : 25012)); break; - case ACTION_SHOW_CODEC: + case ACTION_PLAYER_DEBUG: m_renderManager.ToggleDebug(); break; + + case ACTION_PLAYER_PROCESS_INFO: + if (g_windowManager.GetActiveWindow() != WINDOW_DIALOG_PLAYER_PROCESS_INFO) + { + g_windowManager.ActivateWindow(WINDOW_DIALOG_PLAYER_PROCESS_INFO); + return true; + } + break; } // return false to inform the caller we didn't handle the message diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp index 7de1e9d6f1..82b8b32eee 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -409,7 +409,7 @@ bool CGUIWindowManager::DestroyWindows() Remove(WINDOW_SETTINGS_SERVICE); Remove(WINDOW_SETTINGS_MYPVR); Remove(WINDOW_SETTINGS_PLAYER); - Remove(WINDOW_SETTINGS_LIBRARY); + Remove(WINDOW_SETTINGS_MEDIA); Remove(WINDOW_SETTINGS_INTERFACE); Remove(WINDOW_DIALOG_KAI_TOAST); diff --git a/xbmc/guilib/WindowIDs.h b/xbmc/guilib/WindowIDs.h index a95c48e704..83c624648e 100644 --- a/xbmc/guilib/WindowIDs.h +++ b/xbmc/guilib/WindowIDs.h @@ -43,7 +43,7 @@ #define WINDOW_LOGIN_SCREEN 10029 #define WINDOW_SETTINGS_PLAYER 10030 -#define WINDOW_SETTINGS_LIBRARY 10031 +#define WINDOW_SETTINGS_MEDIA 10031 #define WINDOW_SETTINGS_INTERFACE 10032 #define WINDOW_SETTINGS_PROFILES 10034 diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index a37e19ae96..97bb27cb17 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -87,7 +87,7 @@ static const ActionMapping actions[] = { "showsubtitles" , ACTION_SHOW_SUBTITLES }, { "nextsubtitle" , ACTION_NEXT_SUBTITLE }, { "cyclesubtitle" , ACTION_CYCLE_SUBTITLE }, - { "codecinfo" , ACTION_SHOW_CODEC }, + { "playerdebug" , ACTION_PLAYER_DEBUG }, { "playerprocessinfo" , ACTION_PLAYER_PROCESS_INFO }, { "nextpicture" , ACTION_NEXT_PICTURE }, { "previouspicture" , ACTION_PREV_PICTURE }, @@ -331,7 +331,7 @@ static const ActionMapping windows[] = { "servicesettings" , WINDOW_SETTINGS_SERVICE }, { "pvrsettings" , WINDOW_SETTINGS_MYPVR }, { "playersettings" , WINDOW_SETTINGS_PLAYER }, - { "librarysettings" , WINDOW_SETTINGS_LIBRARY }, + { "mediasettings" , WINDOW_SETTINGS_MEDIA }, { "interfacesettings" , WINDOW_SETTINGS_INTERFACE }, { "videoplaylist" , WINDOW_VIDEO_PLAYLIST }, { "loginscreen" , WINDOW_LOGIN_SCREEN }, diff --git a/xbmc/input/Key.h b/xbmc/input/Key.h index 1147137a73..bdc478cbd5 100644 --- a/xbmc/input/Key.h +++ b/xbmc/input/Key.h @@ -172,7 +172,7 @@ #define ACTION_SHOW_OSD 24 //!< show/hide OSD. Can b used in videoFullScreen.xml window id=2005 #define ACTION_SHOW_SUBTITLES 25 //!< turn subtitles on/off. Can b used in videoFullScreen.xml window id=2005 #define ACTION_NEXT_SUBTITLE 26 //!< switch to next subtitle of movie. Can b used in videoFullScreen.xml window id=2005 -#define ACTION_SHOW_CODEC 27 //!< show debug info for VideoPlayer +#define ACTION_PLAYER_DEBUG 27 //!< show debug info for VideoPlayer #define ACTION_NEXT_PICTURE 28 //!< show next picture of slideshow. Can b used in slideshow.xml window id=2007 #define ACTION_PREV_PICTURE 29 //!< show previous picture of slideshow. Can b used in slideshow.xml window id=2007 #define ACTION_ZOOM_OUT 30 //!< zoom in picture during slideshow. Can b used in slideshow.xml window id=2007 diff --git a/xbmc/interfaces/json-rpc/InputOperations.cpp b/xbmc/interfaces/json-rpc/InputOperations.cpp index ee75e5d912..6788b8f9be 100644 --- a/xbmc/interfaces/json-rpc/InputOperations.cpp +++ b/xbmc/interfaces/json-rpc/InputOperations.cpp @@ -142,7 +142,7 @@ JSONRPC_STATUS CInputOperations::Home(const std::string &method, ITransportLayer JSONRPC_STATUS CInputOperations::ShowCodec(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant ¶meterObject, CVariant &result) { - return SendAction(ACTION_SHOW_CODEC); + return MethodNotFound; } JSONRPC_STATUS CInputOperations::ShowPlayerProcessInfo(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant ¶meterObject, CVariant &result) diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt index 2540a3a5bd..c650e0fce4 100644 --- a/xbmc/interfaces/json-rpc/schema/version.txt +++ b/xbmc/interfaces/json-rpc/schema/version.txt @@ -1 +1 @@ -7.20.0 +7.20.1 diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index 2890113e6d..c847bb4f6b 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -737,7 +737,7 @@ bool CGUIWindowSlideShow::OnAction(const CAction &action) { switch (action.GetID()) { - case ACTION_SHOW_CODEC: + case ACTION_SHOW_INFO: { CGUIDialogPictureInfo *pictureInfo = (CGUIDialogPictureInfo *)g_windowManager.GetWindow(WINDOW_DIALOG_PICTURE_INFO); if (pictureInfo) diff --git a/xbmc/platform/darwin/DarwinUtils.mm b/xbmc/platform/darwin/DarwinUtils.mm index 11be67a747..509cce5cc7 100644 --- a/xbmc/platform/darwin/DarwinUtils.mm +++ b/xbmc/platform/darwin/DarwinUtils.mm @@ -635,6 +635,7 @@ const std::string& CDarwinUtils::GetManufacturer(void) bool CDarwinUtils::IsAliasShortcut(const std::string& path, bool isdirectory) { bool ret = false; + #if defined(TARGET_DARWIN_OSX) CCocoaAutoPool pool; diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index 9b8331385e..a8114aa909 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -413,6 +413,9 @@ const std::string CSettings::SETTING_ADDONS_ALLOW_UNKNOWN_SOURCES = "addons.unkn const std::string CSettings::SETTING_ADDONS_MANAGE_DEPENDENCIES = "addons.managedependencies"; const std::string CSettings::SETTING_GENERAL_ADDONFOREIGNFILTER = "general.addonforeignfilter"; const std::string CSettings::SETTING_GENERAL_ADDONBROKENFILTER = "general.addonbrokenfilter"; +const std::string CSettings::SETTING_SOURCE_VIDEOS = "source.videos"; +const std::string CSettings::SETTING_SOURCE_MUSIC = "source.music"; +const std::string CSettings::SETTING_SOURCE_PICTURES = "source.pictures"; CSettings::CSettings() : m_initialized(false) @@ -1092,6 +1095,9 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC); settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE); settingSet.insert(CSettings::SETTING_AUDIOOUTPUT_VOLUMESTEPS); + settingSet.insert(CSettings::SETTING_SOURCE_VIDEOS); + settingSet.insert(CSettings::SETTING_SOURCE_MUSIC); + settingSet.insert(CSettings::SETTING_SOURCE_PICTURES); m_settingsManager->RegisterCallback(&g_application, settingSet); settingSet.clear(); diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h index 4d5ff930a8..be37b69c99 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h @@ -370,6 +370,9 @@ public: static const std::string SETTING_ADDONS_ALLOW_UNKNOWN_SOURCES; static const std::string SETTING_GENERAL_ADDONFOREIGNFILTER; static const std::string SETTING_GENERAL_ADDONBROKENFILTER; + static const std::string SETTING_SOURCE_VIDEOS; + static const std::string SETTING_SOURCE_MUSIC; + static const std::string SETTING_SOURCE_PICTURES; /*! \brief Creates a new settings wrapper around a new settings manager. diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp index 2cc18d0270..d32cfbe8b7 100644 --- a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp @@ -35,7 +35,7 @@ #define SETTINGS_SERVICE WINDOW_SETTINGS_SERVICE - WINDOW_SETTINGS_START #define SETTINGS_PVR WINDOW_SETTINGS_MYPVR - WINDOW_SETTINGS_START #define SETTINGS_PLAYER WINDOW_SETTINGS_PLAYER - WINDOW_SETTINGS_START -#define SETTINGS_LIBRARY WINDOW_SETTINGS_LIBRARY - WINDOW_SETTINGS_START +#define SETTINGS_MEDIA WINDOW_SETTINGS_MEDIA - WINDOW_SETTINGS_START #define SETTINGS_INTERFACE WINDOW_SETTINGS_INTERFACE - WINDOW_SETTINGS_START #define CONTRL_BTN_LEVELS 20 @@ -49,7 +49,7 @@ static const SettingGroup s_settingGroupMap[] = { { SETTINGS_SYSTEM, "syste { SETTINGS_SERVICE, "services" }, { SETTINGS_PVR, "pvr" }, { SETTINGS_PLAYER, "player" }, - { SETTINGS_LIBRARY, "library" }, + { SETTINGS_MEDIA, "media" }, { SETTINGS_INTERFACE, "interface" } }; #define SettingGroupSize sizeof(s_settingGroupMap) / sizeof(SettingGroup) @@ -68,7 +68,7 @@ CGUIWindowSettingsCategory::CGUIWindowSettingsCategory() m_idRange.push_back(WINDOW_SETTINGS_SERVICE); m_idRange.push_back(WINDOW_SETTINGS_MYPVR); m_idRange.push_back(WINDOW_SETTINGS_PLAYER); - m_idRange.push_back(WINDOW_SETTINGS_LIBRARY); + m_idRange.push_back(WINDOW_SETTINGS_MEDIA); m_idRange.push_back(WINDOW_SETTINGS_INTERFACE); } |