* .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 :-).

diff --git a/.cvsignore b/.cvsignore
index 6928ee973be83b989027a1d1c3b8db5d604d0d16..7ceacb6e521e116234825c0e9f07fc28711b1b71 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,5 @@
 .*
+core
 dep
 gmon.out
 vlc

diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c
index d4bf1534f2a6ece29a3c814da6895840031059b2..2673bbea1c3b4e450dd029a6ac55b8d66820babd 100644 (file)
--- a/src/audio_output/audio_output.c
+++ b/src/audio_output/audio_output.c
@@ -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)
         / (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 );
 
     p_fifo->l_units = (((l_units - (p_fifo->l_unit -

diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c
index 6ac632a02b70795fa3e57c0c1f86353e8adc1a87..1cb46071efc2ddcd3febb37b5117019666156f7e 100644 (file)
--- a/src/interface/intf_ctrl.c
+++ b/src/interface/intf_ctrl.c
@@ -195,7 +195,7 @@ const intf_command_t control_command[] =
     /* usage: */    "vlan synchro\n" \
     "vlan [intf=<interface>] request\n" \
     "vlan [intf=<interface>] join <vlan>\n" \
-    "vlan [intf=<interface>] leave"
+    "vlan [intf=<interface>] leave",
     /* help: */     "Perform various operations on vlans. 'synchro' resynchronize " \
     "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." },
@@ -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( i_argc == 2 )
     {
+fprintf( stderr, "maxx debug: coin\n" );
         for( i_index = 0; control_command[i_index].psz_name 
                  && strcmp( control_command[i_index].psz_name, p_argv[1].psz_str );
              i_index++ )
         {
             ;
         }
+fprintf( stderr, "maxx debug: meuh\n" );
         /* Command has been found in list */
         if( control_command[i_index].psz_name )
         {
+fprintf( stderr, "maxx debug: meow\n" );
             intf_IntfMsg( control_command[i_index].psz_usage );
+fprintf( stderr, "maxx debug: blah\n" );
             intf_IntfMsg( control_command[i_index].psz_help );
+fprintf( stderr, "maxx debug: blih\n" );
         }
         /* Command is unknown */
         else