Commit 7cee752c authored by Michel Kaempf's avatar Michel Kaempf

* .cvsignore :

+ Rajout du fichier core ;

* audio_output/audio_output.c :
+ Rajout de messages de debug :
- nombre de frames audio dans la plage dat�e courante ;
- dur�e de cette plage audio dat�e (en �s) ;
- fr�quence du flux sonore pour cette plage dat�e ;

* interface/intf_ctrl.c :
- Correction du bug `help vlan' (mouahaha il manquait une virgule :-).
parent cefd4199
.* .*
core
dep dep
gmon.out gmon.out
vlc vlc
......
...@@ -506,6 +506,11 @@ static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo/*, ...@@ -506,6 +506,11 @@ static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo/*,
l_rate = (long)( ((mtime_t)l_units * 1000000) l_rate = (long)( ((mtime_t)l_units * 1000000)
/ (p_fifo->date[p_fifo->l_next_frame] - p_fifo->date[p_fifo->l_start_frame]) ); / (p_fifo->date[p_fifo->l_next_frame] - p_fifo->date[p_fifo->l_start_frame]) );
intf_DbgMsg( "aout debug: %li frame(s), %lli s, %li Hz\n",
(p_fifo->l_next_frame - p_fifo->l_start_frame) & AOUT_FIFO_SIZE,
p_fifo->date[p_fifo->l_next_frame] - p_fifo->date[p_fifo->l_start_frame],
l_rate );
InitializeIncrement( &p_fifo->unit_increment, l_rate, p_aout->dsp.l_rate ); InitializeIncrement( &p_fifo->unit_increment, l_rate, p_aout->dsp.l_rate );
p_fifo->l_units = (((l_units - (p_fifo->l_unit - p_fifo->l_units = (((l_units - (p_fifo->l_unit -
......
...@@ -195,7 +195,7 @@ const intf_command_t control_command[] = ...@@ -195,7 +195,7 @@ const intf_command_t control_command[] =
/* usage: */ "vlan synchro\n" \ /* usage: */ "vlan synchro\n" \
"vlan [intf=<interface>] request\n" \ "vlan [intf=<interface>] request\n" \
"vlan [intf=<interface>] join <vlan>\n" \ "vlan [intf=<interface>] join <vlan>\n" \
"vlan [intf=<interface>] leave" "vlan [intf=<interface>] leave",
/* help: */ "Perform various operations on vlans. 'synchro' resynchronize " \ /* help: */ "Perform various operations on vlans. 'synchro' resynchronize " \
"with the server. 'request' ask which is the current vlan (for the default " \ "with the server. 'request' ask which is the current vlan (for the default " \
"interface or for a given one). 'join' and 'leave' try to change vlan." }, "interface or for a given one). 'join' and 'leave' try to change vlan." },
...@@ -259,17 +259,22 @@ static int Help( int i_argc, intf_arg_t *p_argv ) ...@@ -259,17 +259,22 @@ static int Help( int i_argc, intf_arg_t *p_argv )
/* If called with an argument: look for the command and display it's help */ /* If called with an argument: look for the command and display it's help */
if( i_argc == 2 ) if( i_argc == 2 )
{ {
fprintf( stderr, "maxx debug: coin\n" );
for( i_index = 0; control_command[i_index].psz_name for( i_index = 0; control_command[i_index].psz_name
&& strcmp( control_command[i_index].psz_name, p_argv[1].psz_str ); && strcmp( control_command[i_index].psz_name, p_argv[1].psz_str );
i_index++ ) i_index++ )
{ {
; ;
} }
fprintf( stderr, "maxx debug: meuh\n" );
/* Command has been found in list */ /* Command has been found in list */
if( control_command[i_index].psz_name ) if( control_command[i_index].psz_name )
{ {
fprintf( stderr, "maxx debug: meow\n" );
intf_IntfMsg( control_command[i_index].psz_usage ); intf_IntfMsg( control_command[i_index].psz_usage );
fprintf( stderr, "maxx debug: blah\n" );
intf_IntfMsg( control_command[i_index].psz_help ); intf_IntfMsg( control_command[i_index].psz_help );
fprintf( stderr, "maxx debug: blih\n" );
} }
/* Command is unknown */ /* Command is unknown */
else else
......
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