From 1b834a3623fd5f845bc628448337a6e3c3355d96 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Tue, 22 Jun 2004 19:34:01 +0000 Subject: [PATCH] * all: rework of the input. --- modules/control/gestures.c | 5 +---- modules/control/hotkeys.c | 6 +++++- modules/control/http.c | 8 ++++---- modules/control/joystick.c | 2 -- modules/control/netsync.c | 1 - modules/control/rc.c | 33 ++++++++++----------------------- 6 files changed, 20 insertions(+), 35 deletions(-) diff --git a/modules/control/gestures.c b/modules/control/gestures.c index bbe1029b6a..0fd5c1fdc7 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -2,7 +2,7 @@ * gestures.c: control vlc with mouse gestures ***************************************************************************** * Copyright (C) 2004 VideoLAN - * $Id: gestures.c,v 1.7 2004/01/25 16:17:03 anil Exp $ + * $Id$ * * Authors: Sigmund Augdal * @@ -32,9 +32,6 @@ #include #include -#include "stream_control.h" -#include "input_ext-intf.h" - /***************************************************************************** * intf_sys_t: description and status of interface *****************************************************************************/ diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 5c73be7dc1..afe09963c7 100755 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -361,7 +361,11 @@ static void Run( intf_thread_t *p_intf ) } else if( p_input ) { - vlc_bool_t b_seekable = p_input->stream.b_seekable; + /* FIXME --fenrir + * How to get a valid value ? + * That's not that easy with some special stream + */ + vlc_bool_t b_seekable = VLC_TRUE; if( i_action == ACTIONID_PAUSE ) { diff --git a/modules/control/http.c b/modules/control/http.c index b5bcb1fddb..b4eb2d952c 100644 --- a/modules/control/http.c +++ b/modules/control/http.c @@ -873,10 +873,10 @@ static mvar_t *mvar_InfoSetNew( char *name, input_thread_t *p_input ) return s; } - vlc_mutex_lock( &p_input->p_item->lock ); - for ( i = 0; i < p_input->p_item->i_categories; i++ ) + vlc_mutex_lock( &p_input->input.p_item->lock ); + for ( i = 0; i < p_input->input.p_item->i_categories; i++ ) { - info_category_t *p_category = p_input->p_item->pp_categories[i]; + info_category_t *p_category = p_input->input.p_item->pp_categories[i]; mvar_t *cat = mvar_New( name, "set" ); mvar_t *iset = mvar_New( "info", "set" ); @@ -896,7 +896,7 @@ static mvar_t *mvar_InfoSetNew( char *name, input_thread_t *p_input ) } mvar_AppendVar( s, cat ); } - vlc_mutex_unlock( &p_input->p_item->lock ); + vlc_mutex_unlock( &p_input->input.p_item->lock ); return s; } diff --git a/modules/control/joystick.c b/modules/control/joystick.c index 8f0b6db671..5212d8b2ac 100644 --- a/modules/control/joystick.c +++ b/modules/control/joystick.c @@ -43,8 +43,6 @@ #include #include "audio_output.h" -#include "stream_control.h" -#include "input_ext-intf.h" /* Default values for parameters */ #define DEFAULT_MAX_SEEK 10 /* seconds */ diff --git a/modules/control/netsync.c b/modules/control/netsync.c index 14bdda562d..c5bc63acf0 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -60,7 +60,6 @@ #endif #include "network.h" -#include "input_ext-plugins.h" #define NETSYNC_PORT_MASTER 9875 #define NETSYNC_PORT_SLAVE 9876 diff --git a/modules/control/rc.c b/modules/control/rc.c index 0f6e605f5a..00e7bfd409 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -132,10 +132,8 @@ static void Run( intf_thread_t *p_intf ) vlc_bool_t b_showpos = config_GetInt( p_intf, "rc-show-pos" ); int i_dummy; - off_t i_oldpos = 0; - off_t i_newpos; - - double f_ratio = 1.0; + int i_oldpos = 0; + int i_newpos; #ifdef WIN32 HANDLE hConsoleIn; @@ -324,23 +322,12 @@ static void Run( intf_thread_t *p_intf ) if( p_input && b_showpos ) { - /* Get position */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( !p_input->b_die && p_input->stream.i_mux_rate ) + i_newpos = 100 * var_GetFloat( p_input, "position" ); + if( i_oldpos != i_newpos ) { -#define A p_input->stream.p_selected_area - f_ratio = 1.0 / ( 50 * p_input->stream.i_mux_rate ); - i_newpos = A->i_tell * f_ratio; - - if( i_oldpos != i_newpos ) - { - i_oldpos = i_newpos; - printf( "pos: %li s / %li s\n", (long int)i_newpos, - (long int)(f_ratio * A->i_size) ); - } -#undef S + i_oldpos = i_newpos; + printf( "pos: %d%%\n", i_newpos ); } - vlc_mutex_unlock( &p_input->stream.stream_lock ); } /* Is there something to do? */ @@ -400,11 +387,11 @@ static void Run( intf_thread_t *p_intf ) if ( p_input ) { int i, j; - vlc_mutex_lock( &p_input->p_item->lock ); - for ( i = 0; i < p_input->p_item->i_categories; i++ ) + vlc_mutex_lock( &p_input->input.p_item->lock ); + for ( i = 0; i < p_input->input.p_item->i_categories; i++ ) { info_category_t *p_category = - p_input->p_item->pp_categories[i]; + p_input->input.p_item->pp_categories[i]; printf( "+----[ %s ]\n", p_category->psz_name ); printf( "| \n" ); @@ -417,7 +404,7 @@ static void Run( intf_thread_t *p_intf ) printf( "| \n" ); } printf( _("+----[ end of stream info ]\n") ); - vlc_mutex_unlock( &p_input->p_item->lock ); + vlc_mutex_unlock( &p_input->input.p_item->lock ); } else { -- 2.39.2