diff gui/interface.c @ 36959:97a4746e7888

Utilize item defaults given in the skin configuration as start values. Do so for movie position, volume and balance (and hence show these values before playback). Add new btnValue() to retrieve the value and replace the btnModify() calls with btnValue() calls. (The btnModify() calls will be performed in the windows' draw handler prior to rendering anyway.) Initialize last_balance with -1 in order to be able to initialize balance (and volume) with the start values prior to playback (in GUI_SET_AUDIO).
author ib
date Mon, 24 Mar 2014 10:48:55 +0000
parents 44dcc6c54014
children 1911049add93
line wrap: on
line diff
--- a/gui/interface.c	Mon Mar 24 10:26:33 2014 +0000
+++ b/gui/interface.c	Mon Mar 24 10:48:55 2014 +0000
@@ -186,9 +186,12 @@
 
     WinID = (Window)guiApp.videoWindow.WindowID;
 
-    btnModify(evSetVolume, guiInfo.Volume);
-    btnModify(evSetBalance, guiInfo.Balance);
-    btnModify(evSetMoviePosition, guiInfo.Position);
+    btnValue(evSetVolume, &guiInfo.Volume);
+    btnValue(evSetBalance, &guiInfo.Balance);
+    btnValue(evSetMoviePosition, &guiInfo.Position);
+
+    if (guiInfo.Position)
+        uiEvent(evSetMoviePosition, guiInfo.Position);
 
     wsWindowVisibility(&guiApp.mainWindow, wsShowWindow);
 
@@ -317,7 +320,7 @@
  */
 int gui(int what, void *data)
 {
-    static float last_balance = 50.0f;
+    static float last_balance = -1.0f;
 #ifdef CONFIG_DVDREAD
     dvd_priv_t *dvd;
 #endif
@@ -709,6 +712,15 @@
             guiInfo.VideoHeight = 0;
         }
 
+        if (last_balance < 0.0f) {
+            uiEvent(ivSetVolume, guiInfo.Volume);
+
+            if (guiInfo.AudioChannels >= 2)
+                uiEvent(ivSetBalance, guiInfo.Balance);
+
+            last_balance = guiInfo.Balance;
+        }
+
         if (gtkEnableAudioEqualizer) {
             equalizer_t eq;
             unsigned int i, j;