Reduce the global verbosity

Change some message severities

diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index f7dbd4635d9d8b699860db972505be438db68a8f..a5614cd863597ec4f1217ab0599bac3ad598eec2 100644 (file)
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -466,7 +466,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer )
 
     if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
     {
-        msg_Info( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d",
+        msg_Dbg( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d",
                   p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
 
         aout_DateInit( &p_sys->end_date, p_sys->i_rate );

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 1f960b6d3856e3d41ea101cf905f91ddc860ca98..568213285998c75173d19eb909e2fd68b417c07b 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -631,7 +631,6 @@ void Interface::SetupHotkeys()
     else
     {
         SetAcceleratorTable( accel );
-        msg_Dbg( p_intf, "accelerator table loaded" );
     }
 
     delete [] p_entries;

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index cf46be9d573d5491f1ccb7c5661b04b810c261da..b964caed8aef2e254745289d14c9e22ea4b1e1fb 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -838,7 +838,6 @@ void Playlist::Rebuild( vlc_bool_t b_root )
     p_view = playlist_ViewFind( p_playlist, i_current_view ); /* FIXME */
 
     /* HACK we should really get new*/
-    msg_Dbg( p_intf, "rebuilding tree for view %i", i_current_view );
     treectrl->DeleteAllItems();
     treectrl->AddRoot( wxU(_("root" )), -1, -1,
                          new PlaylistItem( p_view->p_root) );

diff --git a/modules/gui/wxwindows/wizard.cpp b/modules/gui/wxwindows/wizard.cpp
index 36f0852af62193af0c6731a85ae9f405dc49b247..5dbe4c34832b1c419ca31c69515da5e3ed885c83 100644 (file)
--- a/modules/gui/wxwindows/wizard.cpp
+++ b/modules/gui/wxwindows/wizard.cpp
@@ -721,8 +721,6 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event)
     {
         int i_from = atoi( from_text->GetValue().mb_str() );
         int i_to = atoi( to_text->GetValue().mb_str() );
-        msg_Dbg( p_intf, "Partial streaming enabled, from %i to %i",
-                         i_from,i_to);
         p_parent->SetPartial( i_from, i_to );
     }
     return;
@@ -1513,12 +1511,10 @@ int WizardDialog::GetAction()
 
 void WizardDialog::Run()
 {
-    msg_Dbg( p_intf,"starting wizard");
     if( RunWizard(page1) )
     {
         int i_size;
         char *psz_opt;
-        msg_Dbg( p_intf,"wizard completed");
 
         if( i_action == ACTION_TRANSCODE )
         {
@@ -1527,7 +1523,7 @@ void WizardDialog::Run()
             msg_Dbg( p_intf,"Using %s (%i kbps) / %s (%i kbps),encap %s",
                                 vcodec,vb,acodec,ab,mux);
             char *psz_transcode;
- 
+
             if( vcodec != NULL || acodec != NULL )
             {
                 int i_tr_size = 14;
@@ -1595,7 +1591,6 @@ void WizardDialog::Run()
                 snprintf( psz_opt, i_size,
                           ":sout=#standard{mux=%s,url=%s,access=%s,%s}",
                           mux, address,method, psz_sap_option);
-                msg_Dbg( p_intf, "Sap enabled: %s", psz_sap_option);
                 if( psz_sap_option ) free( psz_sap_option );
             }
             else
@@ -1618,7 +1613,6 @@ void WizardDialog::Run()
             if( i_from != 0)
             {
                 char psz_from[20];
-                msg_Dbg( p_intf, "Setting starttime");
                 snprintf( psz_from, 20, "start-time=%i", i_from);
                 playlist_ItemAddOption( p_item, psz_from);
             }
@@ -1642,10 +1636,6 @@ void WizardDialog::Run()
                           wxICON_WARNING | wxOK, this );
         }
     }
-    else
-    {
-        msg_Dbg( p_intf, "wizard was cancelled");
-    }
 }
 /****************************************************************
  * Local helper functions

diff --git a/src/input/access.c b/src/input/access.c
index 48bccdba03402c0b90d5c795c4f4084715179d41..dabe394eb49e9181b9ad68ca50f34458fda17b2c 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -48,7 +48,7 @@ access_t *__access2_New( vlc_object_t *p_obj,
     p_access->psz_demux  = strdup( "" );
 
     if( !b_quick )
-        msg_Dbg( p_obj, "access2_New: access='%s' path='%s'",
+        msg_Dbg( p_obj, "creating access '%s' path='%s'",
                  p_access->psz_access, p_access->psz_path );
 
     p_access->pf_read    = NULL;

diff --git a/src/input/demux.c b/src/input/demux.c
index b014b5a6b7aa0d8ffc7ff29ad94f2340b1d01c5e..17ff61f26d19df26f5c3e41c0ba0c3b5c1f7d574 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -57,7 +57,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
 
     if( !b_quick )
     {
-        msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'",
+        msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' path='%s'",
                  p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );
     }
 

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 62f6022cd80d5e28145a60b79322bf1c41c36248..0ded702022ab2bdd5d3bc11945bfa9a2a4d77641 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -173,7 +173,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
     if( p_sys->ppsz_audio_language )
     {
         for( i = 0; p_sys->ppsz_audio_language[i]; i++ )
-            msg_Dbg( p_input, "Select audio in language[%d] %s",
+            msg_Dbg( p_input, "select audio in language[%d] %s",
                      i, p_sys->ppsz_audio_language[i] );
     }
     if( val.psz_string ) free( val.psz_string );
@@ -183,7 +183,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input )
     if( p_sys->ppsz_sub_language )
     {
         for( i = 0; p_sys->ppsz_sub_language[i]; i++ )
-            msg_Dbg( p_input, "Select subtitle in language[%d] %s",
+            msg_Dbg( p_input, "select subtitle in language[%d] %s",
                      i, p_sys->ppsz_sub_language[i] );
     }
     if( val.psz_string ) free( val.psz_string );
@@ -399,7 +399,7 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
     if( p_sys->p_pgrm )
     {
         es_out_pgrm_t *old = p_sys->p_pgrm;
-        msg_Dbg( p_input, "Unselecting program id=%d", old->i_id );
+        msg_Dbg( p_input, "unselecting program id=%d", old->i_id );
 
         for( i = 0; i < p_sys->i_es; i++ )
         {
@@ -413,7 +413,7 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
         p_sys->p_es_video = NULL;
     }
 
-    msg_Dbg( p_input, "Selecting program id=%d", p_pgrm->i_id );
+    msg_Dbg( p_input, "selecting program id=%d", p_pgrm->i_id );
 
     /* Mark it selected */
     p_pgrm->b_selected = VLC_TRUE;

diff --git a/src/input/input.c b/src/input/input.c
index ccfc4f43de52a621317bcaab0da64699e3a6c081..96ba03bdc2ccb07ceafd84f43d013ce8661aa9d8 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -162,7 +162,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
     vlc_mutex_lock( &p_item->lock );
     for( i = 0; i < p_item->i_options; i++ )
     {
-//        msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] );
         ParseOption( p_input, p_item->ppsz_options[i] );
     }
     vlc_mutex_unlock( &p_item->lock );
@@ -710,7 +709,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
             {
                 vlc_value_t s;
 
-                msg_Dbg( p_input, "start-time: %ds",
+                msg_Dbg( p_input, "starting at time: %ds",
                                   (int)( p_input->i_start / I64C(1000000) ) );
 
                 s.i_time = p_input->i_start;
@@ -835,7 +834,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
                     break;
                 }
 
-                msg_Dbg( p_input, "adding slave '%s'", psz );
+                msg_Dbg( p_input, "adding slave input '%s'", psz );
                 slave = InputSourceNew( p_input );
                 if( !InputSourceInit( p_input, slave, psz, NULL, VLC_FALSE ) )
                 {
@@ -1141,8 +1140,9 @@ static void ControlReduce( input_thread_t *p_input )
         const int i_ct = p_input->control[i].i_type;
 
         /* XXX We can't merge INPUT_CONTROL_SET_ES */
-        msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
+/*        msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
                  i_lt, i_ct );
+*/
         if( i_lt == i_ct &&
             ( i_ct == INPUT_CONTROL_SET_STATE ||
               i_ct == INPUT_CONTROL_SET_RATE ||
@@ -1154,7 +1154,7 @@ static void ControlReduce( input_thread_t *p_input )
               i_ct == INPUT_CONTROL_SET_BOOKMARK ) )
         {
             int j;
-            msg_Dbg( p_input, "merged at %d", i );
+//            msg_Dbg( p_input, "merged at %d", i );
             /* Remove the i-1 */
             for( j = i; j <  p_input->i_control; j++ )
                 p_input->control[j-1] = p_input->control[j];
@@ -1180,7 +1180,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
     switch( i_type )
     {
         case INPUT_CONTROL_SET_DIE:
-            msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" );
+            msg_Dbg( p_input, "control: stopping input" );
             /* Mark all submodules to die */
             if( p_input->input.p_access )
                 p_input->input.p_access->b_die = VLC_TRUE;

diff --git a/src/misc/modules.c b/src/misc/modules.c
index ac2720dd88278e8878f50a76edad932c6ccb7d5f..93ec417c0a87f6ae386fdce6b9dc7390ef982e43 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -406,7 +406,6 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
     char *psz_shortcuts = NULL, *psz_var = NULL;
     vlc_bool_t b_force_backup = p_this->b_force;
 
-    msg_Dbg( p_this, "looking for %s module", psz_capability );
 
     /* Deal with variables */
     if( psz_name && psz_name[0] == '$' )
@@ -602,8 +601,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
         i_index++;
     }
 
-    msg_Dbg( p_this, "probing %i candidate%s",
-                     i_index, i_index == 1 ? "" : "s" );
+    msg_Dbg( p_this, "looking for %s module: %i candidate%s", psz_capability,
+                                            i_index, i_index == 1 ? "" : "s" );
 
     /* Lock all candidate modules */
     p_tmp = p_first;

diff --git a/src/playlist/item-ext.c b/src/playlist/item-ext.c
index d8c54adc0ac1926d8d639db3ffda5954de95d884..edb36df5bce4174ae1024c1ce4641a0206305851 100644 (file)
--- a/src/playlist/item-ext.c
+++ b/src/playlist/item-ext.c
@@ -151,7 +151,7 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
          i_mode |= PLAYLIST_APPEND;
     }
 
-    msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+    msg_Info( p_playlist, "adding playlist item `%s' ( %s )",
              p_item->input.psz_name, p_item->input.psz_uri );
 
     p_item->input.i_id = ++p_playlist->i_last_id;
@@ -331,7 +331,7 @@ int playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item,
         i_mode |= PLAYLIST_APPEND;
     }
 
-    msg_Dbg( p_playlist, "adding playlist item `%s' ( %s )",
+    msg_Info( p_playlist, "adding playlist item `%s' ( %s )",
              p_item->input.psz_name, p_item->input.psz_uri );
 
     p_item->input.i_id = ++p_playlist->i_last_id;
@@ -642,7 +642,7 @@ int playlist_Delete( playlist_t * p_playlist, int i_id )
         p_playlist->status.p_item = NULL;
     }
 
-    msg_Dbg( p_playlist, "deleting playlist item `%s'",
+    msg_Info( p_playlist, "deleting playlist item `%s'",
                           p_item->input.psz_name );
 
     /* Remove the item from all its parent nodes */

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 007e9d4a90027cd692c8ecf389b9e4073769b472..5c441d72275d73fff5a55c7c1d7027cbed44b723 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -49,7 +49,7 @@ int playlist_Import( playlist_t * p_playlist, const char *psz_filename )
     char *psz_uri;
     int i_id;
 
-    msg_Dbg( p_playlist, "clearing playlist");
+    msg_Info( p_playlist, "clearing playlist");
     playlist_Clear( p_playlist );
 
 
@@ -83,7 +83,7 @@ int playlist_Load( playlist_t * p_playlist, const char *psz_filename )
     char *psz_uri;
     int i_id;
 
-    msg_Dbg( p_playlist, "clearing playlist");
+    msg_Info( p_playlist, "clearing playlist");
     playlist_Clear( p_playlist );
 
 

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 23b67811573d433e056f6bcf59a7321afc7c0ce7..b9f71eda6dd48d689a4d4128d64d9a3b7865bfb5 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -36,7 +36,7 @@
 #define TITLE_SIMPLE   N_( "Manually added" )
 #define TITLE_ALL      N_( "All items, unsorted" )
 
-#define PLAYLIST_PROFILE 1
+#undef PLAYLIST_PROFILE
 #undef PLAYLIST_DEBUG
 
 /*****************************************************************************
@@ -809,7 +809,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
     /* Start the real work */
     if( p_playlist->request.b_request )
     {
+#ifdef PLAYLIST_DEBUG
         msg_Dbg( p_playlist,"processing request" );
+#endif
         /* We are not playing from a view */
         if(  p_playlist->request.i_view == -1  )
         {
@@ -923,7 +925,6 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
             }
             else
             {
-                msg_Dbg( p_playlist,"finished" );
                 if( b_loop && p_playlist->i_size > 0)
                 {
                     p_playlist->i_index = 0;
@@ -976,58 +977,11 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
 
     if( p_new == NULL )
     {
-        msg_Info( p_playlist, "Nothing to play" );
+        msg_Info( p_playlist, "nothing to play" );
     }
     return p_new;
 }
 
-
-#if 0
-
-
-static void SkipItem( playlist_t *p_playlist, int i_arg )
-{
-    int i_oldindex = p_playlist->i_index;
-    vlc_bool_t b_random, b_repeat, b_loop;
-    vlc_value_t val;
-    int i_count;
-
-    /* Increment */
-    else if( !b_repeat )
-    {
-        p_playlist->i_index += i_arg;
-    }
-
-    /* Boundary check */
-    if( p_playlist->i_index >= p_playlist->i_size )
-    {
-        if( p_playlist->i_status == PLAYLIST_STOPPED || b_random || b_loop )
-        {
-            p_playlist->i_index -= p_playlist->i_size
-                         * ( p_playlist->i_index / p_playlist->i_size );
-        }
-        else
-        {
-            /* Don't loop by default: stop at playlist end */
-            p_playlist->i_index = i_oldindex;
-            p_playlist->i_status = PLAYLIST_STOPPED;
-        }
-    }
-    else if( p_playlist->i_index < 0 )
-    {
-        p_playlist->i_index = p_playlist->i_size - 1;
-    }
-
-    /* Check that the item is enabled */
-    if( p_playlist->pp_items[p_playlist->i_index]->b_enabled == VLC_FALSE &&
-        p_playlist->i_enabled != 0)
-    {
-        SkipItem( p_playlist , 1 );
-    }
-}
-
-#endif
-
 /*****************************************************************************
  * PlayItem: start the input thread for an item
  ****************************************************************************/

diff --git a/src/playlist/view.c b/src/playlist/view.c
index 49bb08199d00cb69f887be241e8fe8df02149f0a..f82ebf930ef2eeff8b88b4e145fccd9b38d86973 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -70,8 +70,6 @@ playlist_view_t * playlist_ViewCreate( playlist_t *p_playlist, int i_id,
 {
     playlist_view_t * p_view;
 
-    msg_Dbg( p_playlist, "creating view %i",i_id );
-
     p_view = malloc( sizeof( playlist_view_t ) );
 
     memset( p_view, 0, sizeof( playlist_view_t ) );
@@ -127,6 +125,7 @@ int playlist_ViewDelete( playlist_t *p_playlist,playlist_view_t *p_view )
     return VLC_SUCCESS;
 }
 
+
 /**
  * Dumps the content of a view
  *
@@ -136,9 +135,11 @@ int playlist_ViewDelete( playlist_t *p_playlist,playlist_view_t *p_view )
  */
 int playlist_ViewDump( playlist_t *p_playlist, playlist_view_t *p_view )
 {
+#ifdef PLAYLIST_DEBUG
     msg_Dbg( p_playlist, "dumping view %i",p_view->i_id );
     playlist_NodeDump( p_playlist,p_view->p_root, 1 );
     return VLC_SUCCESS;
+#endif
 }
 
 /**
@@ -907,7 +908,8 @@ playlist_item_t *playlist_FindDirectParent( playlist_t *p_playlist,
 }
 
 
-/* This function dumps a node */
+#ifdef PLAYLIST_DEBUG
+/* This function dumps a node : to be used only for debug*/
 void playlist_NodeDump( playlist_t *p_playlist, playlist_item_t *p_item,
                         int i_level )
 {
@@ -940,3 +942,4 @@ void playlist_NodeDump( playlist_t *p_playlist, playlist_item_t *p_item,
     }
     return;
 }
+#endif