Commit c56d3b79 authored by Olivier Aubert's avatar Olivier Aubert

* Bug fix in unit conversion

* Updated text display to new API (added i_channel)
parent b602fb16
...@@ -123,7 +123,10 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P ...@@ -123,7 +123,10 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P
vlc_value_t val; vlc_value_t val;
val.i_time = 0; val.i_time = 0;
if( p_input )
{
var_Get( p_input, "time", &val ); var_Get( p_input, "time", &val );
}
l_pos = 1000 * mediacontrol_unit_convert( p_input, l_pos = 1000 * mediacontrol_unit_convert( p_input,
pos->key, pos->key,
...@@ -138,7 +141,10 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P ...@@ -138,7 +141,10 @@ mediacontrol_position2microsecond( input_thread_t* p_input, const mediacontrol_P
vlc_value_t val; vlc_value_t val;
val.i_time = 0; val.i_time = 0;
if( p_input )
{
var_Get( p_input, "length", &val ); var_Get( p_input, "length", &val );
}
if( val.i_time > 0) if( val.i_time > 0)
{ {
...@@ -736,7 +742,7 @@ mediacontrol_display_text( mediacontrol_Instance *self, ...@@ -736,7 +742,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
mediacontrol_MediaTime, mediacontrol_MediaTime,
end->value ); end->value );
vout_ShowTextRelative( p_vout, ( char* ) message, NULL, vout_ShowTextRelative( p_vout, SUBT1_CHAN, ( char* ) message, NULL,
OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 20, 20, OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 20, 20,
i_duration ); i_duration );
} }
...@@ -762,7 +768,7 @@ mediacontrol_display_text( mediacontrol_Instance *self, ...@@ -762,7 +768,7 @@ mediacontrol_display_text( mediacontrol_Instance *self,
( mediacontrol_Position * ) end ); ( mediacontrol_Position * ) end );
i_fin += i_now; i_fin += i_now;
vout_ShowTextAbsolute( p_vout,( char* )message, NULL, vout_ShowTextAbsolute( p_vout, SUBT1_CHAN, ( char* )message, NULL,
OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 20, 20, OSD_ALIGN_BOTTOM | OSD_ALIGN_LEFT, 20, 20,
i_debut, i_fin ); i_debut, i_fin );
} }
......
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