* use var_Set/Get "state"/"position"/"rate" instead of old functions.
authorLaurent Aimar <fenrir@videolan.org>
Mon, 7 Jun 2004 18:26:27 +0000 (18:26 +0000)
committerLaurent Aimar <fenrir@videolan.org>
Mon, 7 Jun 2004 18:26:27 +0000 (18:26 +0000)
  I haven't tested thoses changes ...

modules/gui/beos/VlcWrapper.cpp
modules/gui/gtk/control.c
modules/gui/gtk/gnome.c
modules/gui/gtk/gtk.c
modules/gui/gtk/gtk_callbacks.c
modules/gui/gtk/menu.c
modules/gui/kde/interface.cpp
modules/gui/pda/pda.c
modules/gui/pda/pda_callbacks.c
modules/gui/qt/intf.cpp
modules/gui/skins/src/vlcproc.cpp

index e1c9882..299901e 100644 (file)
@@ -121,8 +121,7 @@ void VlcWrapper::InputSetRate( int rate )
     {
         return;
     }
-
-    input_SetRate( p_input, rate );
+    var_SetInteger( p_input, "rate", rate );
 }
 
 BList * VlcWrapper::GetChannels( int i_cat )
@@ -423,7 +422,7 @@ void VlcWrapper::PlaylistPause()
 {
     if( p_input )
     {
-        input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+        var_SetInteger( p_input, "state", PAUSE_S );
     }
 }
 
index 9f4273b..1a9ed8a 100644 (file)
@@ -2,7 +2,7 @@
  * control.c : functions to handle stream control buttons.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: control.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          St├ęphane Borel <stef@via.ecp.fr>
@@ -118,7 +118,7 @@ gboolean GtkControlPause( GtkWidget       *widget,
         return FALSE;
     }
 
-    input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
+    var_SetInteger( p_intf->p_sys->p_input, PAUSE_S );
 
     return TRUE;
 }
@@ -134,7 +134,7 @@ gboolean GtkControlSlow( GtkWidget       *widget,
         return FALSE;
     }
 
-    input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
+    var_SetVoid( p_intf->p_sys->p_input, "rate-slower" );
 
     return TRUE;
 }
@@ -150,7 +150,7 @@ gboolean GtkControlFast( GtkWidget       *widget,
         return FALSE;
     }
 
-    input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
+    var_SetVoid( p_intf->p_sys->p_input, "rate-faster" );
 
     return TRUE;
 }
index 59f627e..e3686c6 100644 (file)
@@ -463,11 +463,13 @@ static void Manage( intf_thread_t *p_intf )
                 {
                     if( newvalue >= 0. && newvalue < 100. )
                     {
-                        off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+                        double f_fpos = (double)newvalue / 100.0;
 
+                        /* release the lock to be able to seek */
                         vlc_mutex_unlock( &p_input->stream.stream_lock );
-                        input_Seek( p_input, i_seek, INPUT_SEEK_SET );
+                        var_SetFloat( p_input, "position", f_fpos );
                         vlc_mutex_lock( &p_input->stream.stream_lock );
+
                     }
 
                     /* Update the old value */
index 26df2b4..10e0114 100644 (file)
@@ -476,11 +476,11 @@ static int Manage( intf_thread_t *p_intf )
                 {
                     if( newvalue >= 0. && newvalue < 100. )
                     {
-                        off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+                        double f_fpos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
                         vlc_mutex_unlock( &p_input->stream.stream_lock );
-                        input_Seek( p_input, i_seek, INPUT_SEEK_SET );
+                        var_SetFloat( p_input, "position", f_fpos );
                         vlc_mutex_lock( &p_input->stream.stream_lock );
                     }
 
index 194fe31..71d5fb4 100644 (file)
@@ -245,7 +245,7 @@ void GtkTitlePrev( GtkButton * button, gpointer user_data )
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
 
         input_ChangeArea( p_intf->p_sys->p_input, p_area );
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
 
         p_intf->p_sys->b_title_update = VLC_TRUE;
         vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
@@ -272,7 +272,7 @@ void GtkTitleNext( GtkButton * button, gpointer user_data )
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
 
         input_ChangeArea( p_intf->p_sys->p_input, p_area );
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
 
         p_intf->p_sys->b_title_update = VLC_TRUE;
         vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
@@ -298,7 +298,7 @@ void GtkChapterPrev( GtkButton * button, gpointer user_data )
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
 
         input_ChangeArea( p_intf->p_sys->p_input, p_area );
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
 
         p_intf->p_sys->b_chapter_update = VLC_TRUE;
         vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
@@ -324,7 +324,7 @@ void GtkChapterNext( GtkButton * button, gpointer user_data )
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
 
         input_ChangeArea( p_intf->p_sys->p_input, p_area );
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, PLAYING_S );
 
         p_intf->p_sys->b_chapter_update = VLC_TRUE;
         vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
@@ -405,9 +405,8 @@ void GtkJumpOk( GtkButton       *button,
     i_seconds = GET_VALUE( "jump_second_spinbutton" );
 #undef GET_VALUE
 
-    input_Seek( p_intf->p_sys->p_input,
-                i_seconds + 60 * i_minutes + 3600 * i_hours,
-                INPUT_SEEK_SECONDS | INPUT_SEEK_SET );
+    var_SetTime( p_intf->p_sys->p_input, "time",
+                 (int64_t)(i_seconds+60*i_minutes+3600*i_hours)*I64C(1000000));
 
     gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
 }
index d18d0a6..32e55f6 100644 (file)
@@ -2,7 +2,7 @@
  * menu.c : functions to handle menu items.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: menu.c,v 1.13 2003/12/22 14:32:56 sam Exp $
+ * $Id$
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *          St├ęphane Borel <stef@via.ecp.fr>
@@ -186,7 +186,7 @@ void GtkPopupNavigationToggle( GtkCheckMenuItem * menuitem,
         GtkSetupMenus( p_intf );
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
 
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
     }
 }
 
@@ -210,7 +210,7 @@ void GtkPopupNavigationToggle( GtkCheckMenuItem * menuitem,
                                                                             \
         p_intf->p_sys->b_program_update = VLC_FALSE;                        \
                                                                             \
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );       \
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );       \
     }
 
 void GtkMenubarProgramToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
@@ -250,7 +250,7 @@ void GtkMenubarTitleToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
         p_intf->p_sys->b_title_update = VLC_FALSE;
 
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
     }
 }
 
@@ -289,7 +289,7 @@ void GtkMenubarChapterToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 
         p_intf->p_sys->b_chapter_update = VLC_FALSE;
 
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
     }
 }
 
index 3e76dfb..926929b 100644 (file)
@@ -377,9 +377,8 @@ void KInterface::slotSliderMoved( int position )
         // XXX is this locking really useful ?
         vlc_mutex_lock( &p_intf->change_lock );
 
-        off_t i_seek = ( position * p_intf->p_sys->p_input->stream.p_selected_area->i_size ) / 10000;
-        input_Seek( p_intf->p_sys->p_input, i_seek, INPUT_SEEK_SET );
-
+        var_SetFloat( p_intf->p_sys->p_input, "position",
+                       (double)position / 10000.0 );
         vlc_mutex_unlock( &p_intf->change_lock );
     }
 }
@@ -573,7 +572,7 @@ void KInterface::slotPlay()
 {
     if( p_intf->p_sys->p_input )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
     }
 }
 
@@ -581,7 +580,7 @@ void KInterface::slotPause()
 {
     if ( p_intf->p_sys->p_input )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PAUSE_S );
     }
 }
 
@@ -627,7 +626,7 @@ void KInterface::slotSlow()
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-slower" );
     }
 }
 
@@ -635,7 +634,7 @@ void KInterface::slotFast()
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-faster" );
     }
 }
 
index bc4a800..b73e4e0 100644 (file)
@@ -2,7 +2,7 @@
  * pda.c : PDA Gtk2 plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: pda.c,v 1.23 2004/03/03 20:39:52 gbazin Exp $
+ * $Id$
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *          Marc Ariberti <marcari@videolan.org>
@@ -468,11 +468,11 @@ static int Manage( intf_thread_t *p_intf )
                      * finished dragging the slider */
                     else if( p_intf->p_sys->b_slider_free )
                     {
-                        off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+                        double f_pos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
                         vlc_mutex_unlock( &p_input->stream.stream_lock );
-                        input_Seek( p_input, i_seek, INPUT_SEEK_SET );
+                        var_SetFloat( p_input, "position", f_pos );
                         vlc_mutex_lock( &p_input->stream.stream_lock );
 
                         /* Update the old value */
@@ -502,11 +502,11 @@ static int Manage( intf_thread_t *p_intf )
                      * finished dragging the slider */
                     else if( p_intf->p_sys->b_slider_free )
                     {
-                        off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+                        double f_pos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
                         vlc_mutex_unlock( &p_input->stream.stream_lock );
-                        input_Seek( p_input, i_seek, INPUT_SEEK_SET );
+                        var_SetFloat( p_input, "position", f_pos );
                         vlc_mutex_lock( &p_input->stream.stream_lock );
 
                         /* Update the old value */
index 5b484a8..3b15bd2 100644 (file)
@@ -356,7 +356,7 @@ void onRewind(GtkButton *button, gpointer user_data)
 
     if (p_intf->p_sys->p_input != NULL)
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-slower" );
     }
 }
 
@@ -367,7 +367,7 @@ void onPause(GtkButton *button, gpointer user_data)
 
     if (p_intf->p_sys->p_input != NULL)
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PAUSE_S );
     }
 }
 
@@ -415,7 +415,7 @@ void onForward(GtkButton *button, gpointer user_data)
 
     if (p_intf->p_sys->p_input != NULL)
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-faster" );
     }
 }
 
index 508e335..e5149b0 100644 (file)
@@ -370,9 +370,8 @@ void IntfWindow::Manage( void )
          * finished dragging the slider */
         else if( p_slider->b_free )
         {
-            off_t i_seek = ( i_value * p_area->i_size ) / SLIDER_MAX;
-
-            input_Seek( p_intf->p_sys->p_input, i_seek, INPUT_SEEK_SET );
+            double f_pos = (double)i_value / (double)SLIDER_MAX;
+            var_SetFloat( p_intf->p_sys->p_input, "position", f_pos );
 
             /* Update the old value */
             p_slider->setOldValue( i_value );
@@ -400,7 +399,7 @@ void IntfWindow::PlaybackPlay( void )
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PLAYING_S );
     }
 }
 
@@ -411,7 +410,7 @@ void IntfWindow::PlaybackPause( void )
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
+        var_SetInteger( p_intf->p_sys->p_input, "state", PAUSE_S );
     }
 }
 
@@ -422,7 +421,7 @@ void IntfWindow::PlaybackSlow( void )
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-slower" );
     }
 }
 
@@ -433,7 +432,7 @@ void IntfWindow::PlaybackFast( void )
 {
     if( p_intf->p_sys->p_input != NULL )
     {
-        input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
+        var_SetVoid( p_intf->p_sys->p_input, "rate-faster" );
     }
 }
 
index c29115c..7b3d857 100644 (file)
@@ -573,11 +573,7 @@ void VlcProc::MoveStream( long Pos )
     if( p_intf->p_sys->p_input == NULL )
         return;
 
-    off_t i_seek = (off_t)(Pos *
-        p_intf->p_sys->p_input->stream.p_selected_area->i_size
-        / SLIDER_RANGE);
-
-    input_Seek( p_intf->p_sys->p_input, i_seek, INPUT_SEEK_SET );
+    var_SetFloat( p_intf->p_input, "position", (double)Pos / SLIDER_RANGE );
 
     // Refresh interface
     InterfaceRefresh();