* modules/gui/wince: new open directory menu (win32 only for now)

[vlc] / modules / gui / wince / timer.cpp

diff --git a/modules/gui/wince/timer.cpp b/modules/gui/wince/timer.cpp
index 600cf83022f7216a3f7696860c0ad943b5d1d74a..d7bd859a8aafe1aa637149c2cb92828edbf7442f 100644 (file)
--- a/modules/gui/wince/timer.cpp
+++ b/modules/gui/wince/timer.cpp
@@ -38,12 +38,12 @@
 
 /* Callback prototype */
 static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
-                        vlc_value_t old_val, vlc_value_t new_val, void *param );
+                        vlc_value_t old_val, vlc_value_t new_val, void * );
 
 /*****************************************************************************
  * Constructor.
  *****************************************************************************/
-Timer::Timer( intf_thread_t *_p_intf, HWND hwnd, Interface *_p_main_interface)//, Interface *_p_main_interface )
+Timer::Timer( intf_thread_t *_p_intf, HWND hwnd, Interface *_p_main_interface)
 {
     p_intf = _p_intf;
     p_main_interface = _p_main_interface;
@@ -118,12 +118,6 @@ void Timer::Notify( void )
 
             p_main_interface->TogglePlayButton( PLAYING_S );
             i_old_playing_status = PLAYING_S;
-
-            /* Take care of the volume */
-            audio_volume_t i_volume;
-            aout_VolumeGet( p_intf, &i_volume );                        
-            SendMessage( p_main_interface->hwndVol, TBM_SETPOS, 1,
-                         200 - (i_volume * 200 * 2 / AOUT_VOLUME_MAX ) );
         }
     }
     else if( p_intf->p_sys->p_input->b_dead )
@@ -183,6 +177,9 @@ void Timer::Notify( void )
                 }
             }
 
+            /* Take care of the volume, etc... */
+            p_main_interface->Update();
+
             /* Manage Playing status */
             var_Get( p_input, "state", &val );
             if( i_old_playing_status != val.i_int )
@@ -241,8 +238,9 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
                         vlc_value_t old_val, vlc_value_t new_val, void *param )
 {
     intf_thread_t *p_intf = (intf_thread_t *)param;
+    POINT point = {0};
 
-    /* Nothing for now */
+    PopupMenu( p_intf, p_intf->p_sys->p_main_window->hWnd, point );
 
     return VLC_SUCCESS;
 }