Commit c6edf8d8 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

* all: don't use input_OffsetToTime anymore.

parent 427b44e2
......@@ -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>
* Stphane 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 );
}
}
......
......@@ -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 );
}
}
......
......@@ -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 );
}
}
......
......@@ -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 );
}
}
......
......@@ -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 Teulire <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 );
......
......@@ -31,6 +31,7 @@
#include "playlist.hpp"
#include "../utils/ustring.hpp"
#define ICONV_CONST
Playlist::Playlist( intf_thread_t *pIntf ): VarList( pIntf )
{
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment