Decrease verbosity

Fix warnings

diff --git a/src/playlist/item-ext.c b/src/playlist/item-ext.c
index 5281f7526d5735f3daf6645682cab9c54ff2e18e..606223f3063b58aeaf1c3e0bb05fd37492792258 100644 (file)
--- a/src/playlist/item-ext.c
+++ b/src/playlist/item-ext.c
@@ -118,7 +118,7 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 {
     vlc_value_t val;
     vlc_bool_t b_end = VLC_FALSE;
-    playlist_view_t *p_view;
+    playlist_view_t *p_view = NULL;
 
     vlc_mutex_lock( &p_playlist->object_lock );
 
@@ -231,7 +231,7 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
         msg_Err( p_playlist, "Insert mode not implemented" );
     }
 
-    if( i_mode & PLAYLIST_GO )
+    if( (i_mode & PLAYLIST_GO ) && p_view )
     {
         p_playlist->request.b_request = VLC_TRUE;
         /* FIXME ... */
@@ -543,8 +543,6 @@ int playlist_Clear( playlist_t * p_playlist )
  */
 int playlist_Disable( playlist_t * p_playlist, playlist_item_t *p_item )
 {
-    vlc_value_t     val;
-
     if( !p_item ) return VLC_EGENERIC;
 
     msg_Dbg( p_playlist, "disabling playlist item `%s'",
@@ -569,8 +567,6 @@ int playlist_Disable( playlist_t * p_playlist, playlist_item_t *p_item )
  */
 int playlist_Enable( playlist_t * p_playlist, playlist_item_t *p_item )
 {
-    vlc_value_t     val;
-
     if( !p_item ) return VLC_EGENERIC;
 
     msg_Dbg( p_playlist, "enabling playlist item `%s'",

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index bce66caaf01b7d154b0cb550df05b86771077f53..23d872cb544240b7525e63fc59de88a3c1b0846f 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -831,7 +831,7 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
     }
 
 #ifdef PLAYLIST_PROFILE
-    msg_Dbg(p_playlist,"next item found in "I64Fi " us\n",mdate()-start );
+    msg_Dbg(p_playlist,"next item found in "I64Fi " us", mdate()-start );
 #endif
 
     if( p_new == NULL ) { msg_Info( p_playlist, "Nothing to play" ); }

diff --git a/src/playlist/view.c b/src/playlist/view.c
index b4618e61e048ff80f1683ee47d1f109fc78a5904..cff79157d9343b474c5b93e444c96c165cf8274b 100644 (file)
--- a/src/playlist/view.c
+++ b/src/playlist/view.c
@@ -29,6 +29,8 @@
 
 #include "vlc_playlist.h"
 
+#undef PLAYLIST_DEBUG
+
 /************************************************************************
  * Local prototypes
  ************************************************************************/
@@ -68,7 +70,7 @@ 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 );
+    msg_Dbg( p_playlist, "creating view %i",i_id );
 
     p_view = malloc( sizeof( playlist_view_t ) );
 
@@ -130,7 +132,7 @@ void playlist_ViewDelete( playlist_t *p_playlist,playlist_view_t *p_view )
  */
 void playlist_ViewDump( playlist_t *p_playlist, playlist_view_t *p_view )
 {
-    msg_Dbg( p_playlist, "Dumping view %i",p_view->i_id );
+    msg_Dbg( p_playlist, "dumping view %i",p_view->i_id );
     playlist_NodeDump( p_playlist,p_view->p_root, 1 );
 }
 
@@ -539,17 +541,19 @@ playlist_item_t *playlist_FindNextFromParent( playlist_t *p_playlist,
 {
     playlist_item_t *p_search, *p_next;
 
+#ifdef PLAYLIST_DEBUG
     if( p_item != NULL )
     {
-        msg_Dbg( p_playlist, "Finding next of %s within %s",
+        msg_Dbg( p_playlist, "finding next of %s within %s",
                         p_item->input.psz_name, p_node->input.psz_name );
     }
     else
     {
-        msg_Dbg( p_playlist, "Finding something to play within %s",
+        msg_Dbg( p_playlist, "finding something to play within %s",
                                  p_node->input.psz_name );
 
     }
+#endif
 
     if( !p_node  || p_node->i_children == -1 )
     {
@@ -616,6 +620,7 @@ playlist_item_t *playlist_FindPrevFromParent( playlist_t *p_playlist,
 {
     playlist_item_t *p_search, *p_next;
 
+#ifdef PLAYLIST_DEBUG
     if( p_item != NULL )
     {
         msg_Dbg( p_playlist, "Finding prev of %s within %s",
@@ -624,8 +629,8 @@ playlist_item_t *playlist_FindPrevFromParent( playlist_t *p_playlist,
     else
     {
         msg_Dbg( p_playlist, "Finding prev from %s",p_node->input.psz_name );
-
     }
+#endif
 
     if( !p_node  || p_node->i_children == -1 )
     {
@@ -696,14 +701,18 @@ playlist_item_t *playlist_RecursiveFindNext( playlist_t *p_playlist,
             {
                 i = -1;
             }
+#ifdef PLAYLIST_DEBUG
             msg_Dbg( p_playlist,"Current item found, child %i of %s",
                                 i , p_parent->input.psz_name );
+#endif
             /* We found our item */
             if( i+1 >= p_parent->i_children )
             {
                 /* Too far... */
+#ifdef PLAYLIST_DEBUG
                 msg_Dbg( p_playlist, "Going up the tree,at parent of %s",
                                 p_parent->input.psz_name );
+#endif
                 if( p_parent == p_root )
                 {
                     /* Hmm, seems it's the end for you, guy ! */
@@ -726,16 +735,20 @@ playlist_item_t *playlist_RecursiveFindNext( playlist_t *p_playlist,
                 if( p_parent->pp_children[i+1]->i_children == -1 )
                 {
                     /* Cool, we have found a real item to play */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "Playing child %i of %s",
                                      i+1 , p_parent->input.psz_name );
+#endif
                     return p_parent->pp_children[i+1];
                 }
                 else if( p_parent->pp_children[i+1]->i_children > 0 )
                 {
                     /* Select the first child of this node */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "%s is a node with children, "
                                  "playing the first",
                                   p_parent->pp_children[i+1]->input.psz_name);
+#endif
                     if( p_parent->pp_children[i+1]->pp_children[0]
                                     ->i_children >= 0 )
                     {
@@ -749,8 +762,10 @@ playlist_item_t *playlist_RecursiveFindNext( playlist_t *p_playlist,
                 else
                 {
                     /* This node has no child... We must continue */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "%s is a node with no children",
                                  p_parent->pp_children[i+1]->input.psz_name);
+#endif
                     p_item = p_parent->pp_children[i+1];
                 }
             }
@@ -778,14 +793,18 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
             {
                 i = -1;
             }
+#ifdef PLAYLIST_DEBUG
             msg_Dbg( p_playlist,"Current item found, child %i of %s",
                              i , p_parent->input.psz_name );
+#endif
             /* We found our item */
             if( i < 1 )
             {
                 /* Too far... */
+#ifdef PLAYLIST_DEBUG
                 msg_Dbg( p_playlist, "Going up the tree,at parent of %s",
                                      p_parent->input.psz_name );
+#endif
                 if( p_parent == p_root )
                 {
                     /* Hmm, seems it's the end for you, guy ! */
@@ -802,16 +821,20 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
                 if( p_parent->pp_children[i-1]->i_children == -1 )
                 {
                     /* Cool, we have found a real item to play */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "Playing child %i of %s",
                                      i-1, p_parent->input.psz_name );
+#endif
                     return p_parent->pp_children[i-1];
                 }
                 else if( p_parent->pp_children[i-1]->i_children > 0 )
                 {
                     /* Select the last child of this node */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "%s is a node with children,"
                                    " playing the last",
                                    p_parent->pp_children[i-1]->input.psz_name);
+#endif
                     if( p_parent->pp_children[i-1]->pp_children[p_parent->
                             pp_children[i-1]->i_children-1]->i_children >= 0 )
                     {
@@ -827,8 +850,10 @@ playlist_item_t *playlist_RecursiveFindPrev( playlist_t *p_playlist,
                 else
                 {
                     /* This node has no child... We must continue */
+#ifdef PLAYLIST_DEBUG
                     msg_Dbg( p_playlist, "%s is a node with no children",
                                 p_parent->pp_children[i-1]->input.psz_name);
+#endif
                     p_item = p_parent->pp_children[i-1];
                 }
             }