first attempt to create new windows for SETTINGS_PLAYBACK and SETTING…

…S_MEDIA
mad-max · Mar 3, 2015 · 91573ce · 91573ce
1 parent 0d541de
commit 91573ce
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/xbmc/guilib/WindowIDs.h b/xbmc/guilib/WindowIDs.h
@@ -56,6 +56,9 @@
 
 #define WINDOW_ADDON_BROWSER              10040
 
+#define WINDOW_SETTINGS_PLAYBACK          10041
+#define WINDOW_SETTINGS_MEDIA             10042
+
 #define WINDOW_SCREENSAVER_DIM               97
 #define WINDOW_DEBUG_INFO                    98
 #define WINDOW_DIALOG_POINTER             10099

diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp
@@ -321,6 +321,8 @@ static const ActionMapping windows[] =
         {"appearancesettings"       , WINDOW_SETTINGS_APPEARANCE},
         {"pvrsettings"              , WINDOW_SETTINGS_MYPVR},
         {"tvsettings"               , WINDOW_SETTINGS_MYPVR},  // backward compat
+        {"playbacksettings"         , WINDOW_SETTINGS_PLAYBACK},
+        {"mediasettings"            , WINDOW_SETTINGS_MEDIA},
         {"scripts"                  , WINDOW_PROGRAMS}, // backward compat
         {"videofiles"               , WINDOW_VIDEO_FILES},
         {"videolibrary"             , WINDOW_VIDEO_NAV},

diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp
@@ -38,6 +38,8 @@ using namespace std;
 #define SETTINGS_SERVICE                WINDOW_SETTINGS_SERVICE - WINDOW_SETTINGS_START
 #define SETTINGS_APPEARANCE             WINDOW_SETTINGS_APPEARANCE - WINDOW_SETTINGS_START
 #define SETTINGS_PVR                    WINDOW_SETTINGS_MYPVR - WINDOW_SETTINGS_START
+#define SETTINGS_PLAYBACK               WINDOW_SETTINGS_PLAYBACK - WINDOW_SETTINGS_START
+#define SETTINGS_MEDIA                  WINDOW_SETTINGS_MEDIA - WINDOW_SETTINGS_START
 
 #define CONTRL_BTN_LEVELS               20
 
@@ -54,7 +56,9 @@ static const SettingGroup s_settingGroupMap[] = { { SETTINGS_PICTURES,    "pictu
                                                   { SETTINGS_VIDEOS,      "videos" },
                                                   { SETTINGS_SERVICE,     "services" },
                                                   { SETTINGS_APPEARANCE,  "appearance" },
-                                                  { SETTINGS_PVR,         "pvr" } };
+                                                  { SETTINGS_PVR,         "pvr" },
+                                                  { SETTINGS_PLAYBACK,    "playback"},
+                                                  { SETTINGS_MEDIA,       "media"} };
 
 #define SettingGroupSize sizeof(s_settingGroupMap) / sizeof(SettingGroup)
 
@@ -77,6 +81,8 @@ CGUIWindowSettingsCategory::CGUIWindowSettingsCategory()
   m_idRange.push_back(WINDOW_SETTINGS_SERVICE);
   m_idRange.push_back(WINDOW_SETTINGS_APPEARANCE);
   m_idRange.push_back(WINDOW_SETTINGS_MYPVR);
+  m_idRange.push_back(WINDOW_SETTINGS_PLAYBACK);
+  m_idRange.push_back(WINDOW_SETTINGS_MEDIA);
 }
 
 CGUIWindowSettingsCategory::~CGUIWindowSettingsCategory()