Merge pull request #9708 from AlwinEsch/improve-adsp-part

[adsp] remove usage of list item entries on skins
xbmc · May 1, 2016 · 5267a69 · 5267a69
2 parents dedb28b + 4d5a718
commit 5267a69
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 76 deletions.
diff --git a/addons/skin.estouchy/xml/DialogAudioDSPManager.xml b/addons/skin.estouchy/xml/DialogAudioDSPManager.xml
@@ -116,43 +116,6 @@
 					<aligny>center</aligny>
 				</control>
 			</focusedlayout>
-			<content>
-				<item id="91">
-					<label>1. $LOCALIZE[15057]</label>
-					<label2>$LOCALIZE[15114]</label2>
-					<visible>true</visible>
-					<onclick>noop</onclick>
-					<property name="currentMode">InputResampling</property>
-				</item>
-				<item id="92">
-					<label>2. $LOCALIZE[15058]</label>
-					<label2>$LOCALIZE[15113]</label2>
-					<visible>true</visible>
-					<onclick>noop</onclick>
-					<property name="currentMode">Preprocessing</property>
-				</item>
-				<item id="93">
-					<label>3. $LOCALIZE[15059]</label>
-					<label2>$LOCALIZE[15115]</label2>
-					<visible>true</visible>
-					<onclick>noop</onclick>
-					<property name="currentMode">Masterprocessing</property>
-				</item>
-				<item id="94">
-					<label>4. $LOCALIZE[15060]</label>
-					<label2>$LOCALIZE[15117]</label2>
-					<visible>true</visible>
-					<onclick>noop</onclick>
-					<property name="currentMode">Postprocessing</property>
-				</item>
-				<item id="95">
-					<label>5. $LOCALIZE[15061]</label>
-					<label2>$LOCALIZE[15116]</label2>
-					<visible>true</visible>
-					<onclick>noop</onclick>
-					<property name="currentMode">OutputResampling</property>
-				</item>
-			</content>
 		</control>
 		<control type="textbox">
 			<posx>20</posx>

diff --git a/addons/skin.estuary/1080i/DialogAudioDSPManager.xml b/addons/skin.estuary/1080i/DialogAudioDSPManager.xml
@@ -66,38 +66,6 @@
 					<label>$INFO[ListItem.Label]</label>
 				</control>
 			</focusedlayout>
-			<content>
-				<item id="91">
-					<label>$LOCALIZE[15057]</label>
-					<label2>$LOCALIZE[15114]</label2>
-					<onclick>noop</onclick>
-					<property name="currentMode">InputResampling</property>
-				</item>
-				<item id="92">
-					<label>$LOCALIZE[15058]</label>
-					<label2>$LOCALIZE[15113]</label2>
-					<onclick>noop</onclick>
-					<property name="currentMode">Preprocessing</property>
-				</item>
-				<item id="93">
-					<label>$LOCALIZE[15059]</label>
-					<label2>$LOCALIZE[15115]</label2>
-					<onclick>noop</onclick>
-					<property name="currentMode">Masterprocessing</property>
-				</item>
-				<item id="94">
-					<label>$LOCALIZE[15060]</label>
-					<label2>$LOCALIZE[15117]</label2>
-					<onclick>noop</onclick>
-					<property name="currentMode">Postprocessing</property>
-				</item>
-				<item id="95">
-					<label>$LOCALIZE[15061]</label>
-					<label2>$LOCALIZE[15116]</label2>
-					<onclick>noop</onclick>
-					<property name="currentMode">OutputResampling</property>
-				</item>
-			</content>
 		</control>
 		<control type="group" id="200">
 			<description>available- and active mode lists</description>

diff --git a/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp b/xbmc/settings/dialogs/GUIDialogAudioDSPManager.cpp
@@ -55,15 +55,17 @@ typedef struct
 {
   const char* sModeType;
   int iModeType;
+  int iName;
+  int iDescription;
 } DSP_MODE_TYPES;
 
 static const DSP_MODE_TYPES dsp_mode_types[] = {
-  { "preprocessing",    AE_DSP_MODE_TYPE_PRE_PROCESS },
-  { "inputresampling",  AE_DSP_MODE_TYPE_INPUT_RESAMPLE },
-  { "masterprocessing", AE_DSP_MODE_TYPE_MASTER_PROCESS },
-  { "outputresampling", AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE },
-  { "postprocessing",   AE_DSP_MODE_TYPE_POST_PROCESS },
-  { "undefined",        AE_DSP_MODE_TYPE_UNDEFINED }
+  { "inputresampling",  AE_DSP_MODE_TYPE_INPUT_RESAMPLE,  15057, 15114 },
+  { "preprocessing",    AE_DSP_MODE_TYPE_PRE_PROCESS,     15058, 15113 },
+  { "masterprocessing", AE_DSP_MODE_TYPE_MASTER_PROCESS,  15059, 15115 },
+  { "postprocessing",   AE_DSP_MODE_TYPE_POST_PROCESS,    15060, 15117 },
+  { "outputresampling", AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE, 15061, 15116 },
+  { "undefined",        AE_DSP_MODE_TYPE_UNDEFINED,       0,     0 }
 };
 
 CGUIDialogAudioDSPManager::CGUIDialogAudioDSPManager(void)
@@ -704,14 +706,24 @@ void CGUIDialogAudioDSPManager::Update()
     return;
   }
 
-  for (int iModeType = 0; iModeType < AE_DSP_MODE_TYPE_MAX; iModeType++)
+  // construct a CFileItemList to pass 'em on to the list
+  CFileItemList items;
+  for (int i = 0; i < AE_DSP_MODE_TYPE_MAX; ++i)
   {
+    int iModeType = dsp_mode_types[i].iModeType;
+
     modes.clear();
     db.GetModes(modes, iModeType);
 
     // No modes available, nothing to do.
     if (!modes.empty())
     {
+      CFileItemPtr item(new CFileItem());
+      item->SetLabel(g_localizeStrings.Get(dsp_mode_types[i].iName));
+      item->SetLabel2(g_localizeStrings.Get(dsp_mode_types[i].iDescription));
+      item->SetProperty("currentMode", dsp_mode_types[i].sModeType);
+      items.Add(item);
+
       AE_DSP_MENUHOOK_CAT menuHook = helper_GetMenuHookCategory(iModeType);
       int continuesNo = 1;
       for (unsigned int iModePtr = 0; iModePtr < modes.size(); iModePtr++)
@@ -742,6 +754,9 @@ void CGUIDialogAudioDSPManager::Update()
     }
   }
 
+  CGUIMessage msg(GUI_MSG_LABEL_BIND, GetID(), CONTROL_LIST_MODE_SELECTION, 0, 0, &items);
+  OnMessage(msg);
+
   db.Close();
 
   pDlgBusy->Close();