* all: don't use input_OffsetToTime anymore.

diff --git a/modules/gui/gtk/display.c b/modules/gui/gtk/display.c
index 780738e773323f758177c331d4c6d8616283858a..499180c507e22c25ed4b64c8dbc28e55490cb63a 100644 (file)
--- a/modules/gui/gtk/display.c
+++ b/modules/gui/gtk/display.c
@@ -2,7 +2,7 @@
  * display.c: Gtk+ tools for main interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2003 VideoLAN
- * $Id: display.c,v 1.12 2003/12/03 13:27:51 rocky Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -62,13 +62,14 @@ void E_(GtkDisplayDate)( GtkAdjustment *p_adj )
 
     if( p_intf->p_sys->p_input )
     {
-#define p_area p_intf->p_sys->p_input->stream.p_selected_area
         char psz_time[ MSTRTIME_MAX_SIZE ];
+        int64_t i_seconds;
+
+        i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+        secstotimestr( psz_time, i_seconds );
 
         gtk_frame_set_label( GTK_FRAME( p_intf->p_sys->p_slider_frame ),
-                        input_OffsetToTime( p_intf->p_sys->p_input, psz_time,
-                                   ( p_area->i_size * p_adj->value ) / 100 ) );
-#undef p_area
+                             psz_time );
      }
 }
 

diff --git a/modules/gui/kde/interface.cpp b/modules/gui/kde/interface.cpp
index 926929b419704026a567351416a40ebc4bd01d2e..9724a3d57cef6c684afff32cb841920732891c48 100644 (file)
--- a/modules/gui/kde/interface.cpp
+++ b/modules/gui/kde/interface.cpp
@@ -502,14 +502,12 @@ void KInterface::slotSliderChanged( int position )
     if( p_intf->p_sys->p_input != NULL )
     {
         char psz_time[ MSTRTIME_MAX_SIZE ];
+        int64_t i_seconds;
 
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
+        i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+        secstotimestr( psz_time, i_seconds );
 
-#define p_area p_intf->p_sys->p_input->stream.p_selected_area
-        statusBar()->changeItem( input_OffsetToTime( p_intf->p_sys->p_input, psz_time, ( p_area->i_size * position ) / 10000 ), ID_DATE );
-#undef p_area
-
-        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
+        statusBar()->changeItem( psz_time, ID_DATE );
      }
 }
 

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index b73e4e03ef1b64f0a46469f08dc2fc7e256443c0..77385e65a919033d3354b22e8b54429f5ff0d1b8 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -558,13 +558,14 @@ void E_(GtkDisplayDate)( GtkAdjustment *p_adj, gpointer userdata )
 
     if( p_intf->p_sys->p_input )
     {
-#define p_area p_intf->p_sys->p_input->stream.p_selected_area
         char psz_time[ MSTRTIME_MAX_SIZE ];
+        int64_t i_seconds;
+
+        i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+        secstotimestr( psz_time, i_seconds );
 
         gtk_label_set_text( GTK_LABEL( p_intf->p_sys->p_slider_label ),
-                        input_OffsetToTime( p_intf->p_sys->p_input, psz_time,
-                                   ( p_area->i_size * p_adj->value ) / 100 ) );
-#undef p_area
+                            psz_time );
      }
 }
 

diff --git a/modules/gui/qt/intf.cpp b/modules/gui/qt/intf.cpp
index e5149b0b33d423ff4b436788efa330f8f348ab56..580e36cfd0fb7f33c191bdf4779ce500014abe7c 100644 (file)
--- a/modules/gui/qt/intf.cpp
+++ b/modules/gui/qt/intf.cpp
@@ -265,12 +265,12 @@ void IntfWindow::DateDisplay( int i_range )
     if( p_intf->p_sys->p_input )
     {
         char psz_time[ MSTRTIME_MAX_SIZE ];
+        int64_t i_seconds;
 
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-        p_date->setText( input_OffsetToTime( p_intf->p_sys->p_input, psz_time,
-           ( p_intf->p_sys->p_input->stream.p_selected_area->i_size * i_range )
-               / SLIDER_MAX ) );
-        vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
+        i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+        secstotimestr( psz_time, i_seconds );
+
+        p_date->setText( psz_time );
     }
 }
 

diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp
index c016944354aa43eaaf11f31a3ffe5f20b810a4d2..1c9868357032a84cc06776d398d6d3bd5438336e 100644 (file)
--- a/modules/gui/skins/src/skin_main.cpp
+++ b/modules/gui/skins/src/skin_main.cpp
@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.55 2003/12/22 02:24:52 sam Exp $
+ * $Id$
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -383,20 +383,26 @@ int SkinManage( intf_thread_t *p_intf )
             // Text char * for updating text controls
             char *text = new char[MSTRTIME_MAX_SIZE];
 
+            int64_t i_seconds, i_length;
+
+            i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+            i_length = var_GetTime( p_intf->p_sys->p_input, "length" ) / I64C(1000000 );
+
+            secstotimestr( psz_time, i_seconds );
+
             // Create end time text
-            input_OffsetToTime( p_intf->p_sys->p_input, &text[1],
-                                p_area->i_size - p_area->i_tell );
+            secstotimestr( &text[1], i_length - i_seconds );
             text[0] = '-';
             p_intf->p_sys->p_theme->EvtBank->Get( "left_time" )
                 ->PostTextMessage( text );
 
             // Create time text and update
-            input_OffsetToTime( p_intf->p_sys->p_input, text, p_area->i_tell );
+            secstotimestr( text, i_seconds );
             p_intf->p_sys->p_theme->EvtBank->Get( "time" )
                 ->PostTextMessage( text );
 
             // Create total time text
-            input_OffsetToTime( p_intf->p_sys->p_input, text, p_area->i_size );
+            secstotimestr( text, i_length );
             p_intf->p_sys->p_theme->EvtBank->Get( "total_time" )
                 ->PostTextMessage( text );
 

diff --git a/modules/gui/skins2/vars/playlist.cpp b/modules/gui/skins2/vars/playlist.cpp
index 6fadc77a7c1d8001c400d8e5e53f2b68ebfabf4f..b09fb362c8518f53978e1f9c8f326b936760d0c6 100644 (file)
--- a/modules/gui/skins2/vars/playlist.cpp
+++ b/modules/gui/skins2/vars/playlist.cpp
@@ -31,6 +31,7 @@
 #include "playlist.hpp"
 #include "../utils/ustring.hpp"
 
+#define ICONV_CONST
 
 Playlist::Playlist( intf_thread_t *pIntf ): VarList( pIntf )
 {

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 5329b93cfe2833692506dffb8a22e513a7b87755..34c85516bd603ad3efe1f748836dc65af9a0f842 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -1230,21 +1230,17 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
         if( p_intf->p_sys->p_input )
         {
             /* Update stream date */
-#define p_area p_intf->p_sys->p_input->stream.p_selected_area
             char psz_time[ MSTRTIME_MAX_SIZE ], psz_total[ MSTRTIME_MAX_SIZE ];
             mtime_t i_seconds;
             vlc_value_t val;
 
-            var_Get( p_intf->p_sys->p_input, "length",  &val );
-            i_seconds = val.i_time / 1000000;
-            secstotimestr ( psz_total, i_seconds );
+            i_seconds = var_GetTime( p_intf->p_sys->p_input, "length" ) / I64C(1000000 );
+            secstotimestr( psz_total, i_seconds );
 
-            statusbar->SetStatusText(
-                wxU(input_OffsetToTime( p_intf->p_sys->p_input,
-                    psz_time, p_area->i_size * event.GetPosition()
-                        / SLIDER_MAX_POS )) + wxString(wxT(" / ")) +
-                        wxU(psz_total), 0 );
-#undef p_area
+            i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+            secstotimestr( psz_time, i_seconds );
+
+            statusbar->SetStatusText( wxU(psz_time)+ wxString(wxT(" / ")) + wxU(psz_total), 0 );
         }
     }
 #endif