From c6edf8d8127367e2a4be94bb6214edf519361216 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Mon, 7 Jun 2004 21:26:35 +0000 Subject: [PATCH] * all: don't use input_OffsetToTime anymore. --- modules/gui/gtk/display.c | 11 ++++++----- modules/gui/kde/interface.cpp | 10 ++++------ modules/gui/pda/pda.c | 9 +++++---- modules/gui/qt/intf.cpp | 10 +++++----- modules/gui/skins/src/skin_main.cpp | 16 +++++++++++----- modules/gui/skins2/vars/playlist.cpp | 1 + modules/gui/wxwindows/interface.cpp | 16 ++++++---------- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/modules/gui/gtk/display.c b/modules/gui/gtk/display.c index 780738e773..499180c507 100644 --- 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 * Stéphane Borel @@ -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 926929b419..9724a3d57c 100644 --- 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 b73e4e03ef..77385e65a9 100644 --- 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 e5149b0b33..580e36cfd0 100644 --- 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 c016944354..1c98683570 100644 --- 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 * Emmanuel Puig @@ -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 6fadc77a7c..b09fb362c8 100644 --- 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 5329b93cfe..34c85516bd 100644 --- 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 -- 2.39.2