X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda%2Faccess.c;h=f4de5bd75d2bc2f2a0bd190671f023982f196530;hb=482d8344a9aadc7c313e63b67432233a7339e35b;hp=087647b5a4839d804a8fa9c95948e5a19651735f;hpb=9630c00c6b310e1a824f0bce00de89f0f777484f;p=vlc

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 087647b5a4..f4de5bd75d 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -30,7 +30,6 @@
 #include "cdda.h"          /* private structures. Also #includes vlc things */
 #include "info.h"          /* headers for meta info retrieval */
 #include "access.h"
-#include <vlc_playlist.h>  /* Has to come *after* cdda.h */
 #include "vlc_keys.h"
 #include <vlc_interface.h>
 
@@ -228,7 +227,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
         /* Return only the dummy RIFF header we created in Open/Init */
         p_block = block_New( p_access, sizeof( WAVEHEADER ) );
         memcpy( p_block->p_buffer, &p_cdda->waveheader, sizeof(WAVEHEADER) );
-        p_cdda->b_header = VLC_TRUE;
+        p_cdda->b_header = true;
         return p_block;
     }
 
@@ -246,7 +245,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
         if( go_on )
         {
             dbg_print( (INPUT_DBG_LSN), "EOF");
-                        p_access->info.b_eof = VLC_TRUE;
+                        p_access->info.b_eof = true;
             return NULL;
         }
 
@@ -283,7 +282,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
     {
         msg_Err( p_access, "cannot get a new block of size: %i",
                 i_blocks * CDIO_CD_FRAMESIZE_RAW );
-        intf_UserFatal( p_access, VLC_FALSE, _("CD reading failed"),
+        intf_UserFatal( p_access, false, _("CD reading failed"),
                         _("VLC could not get a new block of size: %i."),
                         i_blocks * CDIO_CD_FRAMESIZE_RAW );
         return NULL;
@@ -389,7 +388,7 @@ CDDARead( access_t * p_access, uint8_t *p_buffer, size_t i_len )
         if( p_cdda->i_track >= p_cdda->i_first_track + p_cdda->i_titles - 1 )
         {
             dbg_print( (INPUT_DBG_LSN), "EOF");
-            p_access->info.b_eof = VLC_TRUE;
+            p_access->info.b_eof = true;
             return 0;
         }
         p_access->info.i_update |= INPUT_UPDATE_TITLE;
@@ -505,7 +504,7 @@ static int CDDASeek( access_t * p_access, int64_t i_pos )
     }
 
     p_access->info.i_pos = i_pos;
-    p_access->info.b_eof = VLC_FALSE;
+    p_access->info.b_eof = false;
     return VLC_SUCCESS;
 }
 
@@ -563,7 +562,7 @@ int CDDAOpen( vlc_object_t *p_this )
     cdda_data_t *p_cdda    = NULL;
     CdIo_t      *p_cdio;
     track_t     i_track = 1;
-    vlc_bool_t  b_single_track = false;
+    bool  b_single_track = false;
     int         i_rc = VLC_EGENERIC;
 
     p_access->p_sys = NULL;
@@ -606,6 +605,7 @@ int CDDAOpen( vlc_object_t *p_this )
         psz_source = var_CreateGetString( p_this, "cd-audio" );
         if( !psz_source || !*psz_source )
         {
+            free( psz_source );
             /* Scan for a CD-ROM drive with a CD-DA in it. */
             char **ppsz_drives =
                     cdio_get_devices_with_cap( NULL,  CDIO_FS_AUDIO, false );
@@ -635,7 +635,6 @@ int CDDAOpen( vlc_object_t *p_this )
     p_cdda = calloc( 1, sizeof(cdda_data_t) );
     if( p_cdda == NULL )
     {
-        msg_Err( p_access, "out of memory" );
         free( psz_source );
         return VLC_ENOMEM;
     }
@@ -656,7 +655,7 @@ int CDDAOpen( vlc_object_t *p_this )
 #endif
 
     p_cdda->psz_source = strdup( psz_source );
-    p_cdda->b_header   = VLC_FALSE;
+    p_cdda->b_header   = false;
     p_cdda->p_cdio     = p_cdio;
     p_cdda->i_tracks   = 0;
     p_cdda->i_titles   = 0;
@@ -716,7 +715,7 @@ int CDDAOpen( vlc_object_t *p_this )
     }
 
     p_access->info.i_update    = 0;
-    p_access->info.b_eof       = VLC_FALSE;
+    p_access->info.b_eof       = false;
     p_access->info.i_title     = 0;
     p_access->info.i_seekpoint = 0;
 
@@ -773,6 +772,7 @@ int CDDAOpen( vlc_object_t *p_this )
                 }
             }
         }
+        free( psz_paranoia );
     }
 #endif
 
@@ -906,8 +906,8 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
 
         case ACCESS_CAN_CONTROL_PACE:
         {
-            vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
-            *pb_bool = p_cdda->b_audio_ctl ? VLC_FALSE : VLC_TRUE;
+            bool *pb_bool = (bool*)va_arg( args, bool* );
+            *pb_bool = p_cdda->b_audio_ctl ? false : true;
             dbg_print( INPUT_DBG_META, "can control pace? %d", *pb_bool);
             return VLC_SUCCESS;
         }
@@ -922,8 +922,8 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
             dbg_print( INPUT_DBG_META, "can pause?");
  common:
             {
-                vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
-                *pb_bool = VLC_TRUE;
+                bool *pb_bool = (bool*)va_arg( args, bool* );
+                *pb_bool = true;
                 return VLC_SUCCESS;
             }