Removes trailing spaces. Removes tabs.

[vlc] / modules / access / cdda / access.c

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 54999a1f34231fc4182528736aec07f4a80f2d40..5ff06a9d78e235facab5f437c16fe732a8ad3d60 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -29,19 +29,18 @@
 #include "callback.h"      /* FIXME - reorganize callback.h, cdda.h better */
 #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_interaction.h>
+#include <vlc_interface.h>
 
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/cd_types.h>
 
-#include <stdio.h>
 
 /* #ifdef variables below are defined via config.h via #include vlc above. */
 #ifdef HAVE_STDLIB_H
-#include <stdlib.h>
 #endif
 
 #ifdef HAVE_SYS_TYPES_H
@@ -49,7 +48,6 @@
 #endif
 
 #ifdef HAVE_STRING_H
-#include <string.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -75,7 +73,7 @@ static int      CDDAInit( access_t *p_access, cdda_data_t *p_cdda ) ;
  * Private functions
  ****************************************************************************/
 
-/* process messages that originate from libcdio. 
+/* process messages that originate from libcdio.
    called by CDDAOpen
 */
 static void
@@ -91,17 +89,17 @@ cdio_log_handler( cdio_log_level_t level, const char message[] )
         case CDIO_LOG_DEBUG:
         case CDIO_LOG_INFO:
             if (p_cdda->i_debug & INPUT_DBG_CDIO)
-            msg_Dbg( p_cdda_input, message);
+            msg_Dbg( p_cdda_input, "%s", message);
             break;
         case CDIO_LOG_WARN:
-            msg_Warn( p_cdda_input, message);
+            msg_Warn( p_cdda_input, "%s", message);
             break;
         case CDIO_LOG_ERROR:
         case CDIO_LOG_ASSERT:
-            msg_Err( p_cdda_input, message);
+            msg_Err( p_cdda_input, "%s", message);
             break;
         default:
-            msg_Warn( p_cdda_input, message,
+            msg_Warn( p_cdda_input, "%s\n%s %d", message,
                     "the above message had unknown cdio log level",
                     level);
             break;
@@ -167,7 +165,7 @@ uninit_log_handler( cdio_log_level_t level, const char message[] )
     /* gl_default_cdio_log_handler (level, message); */
 }
 
-/* Only used in audio control mode. Gets the current LSN from the 
+/* Only used in audio control mode. Gets the current LSN from the
    CD-ROM drive. */
 static int64_t get_audio_position ( access_t *p_access )
 {
@@ -222,7 +220,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
     cdda_data_t *p_cdda   = (cdda_data_t *) p_access->p_sys;
     int          i_blocks = p_cdda->i_blocks_per_read;
 
-    dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN), 
+    dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN),
                 "called i_lsn: %d i_pos: %lld, size: %lld",
                 p_cdda->i_lsn, p_access->info.i_pos, p_access->info.i_size );
 
@@ -290,8 +288,8 @@ 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"), 
-                        _("VLC could not get a new block of size: %i."), 
+        intf_UserFatal( p_access, VLC_FALSE, _("CD reading failed"),
+                        _("VLC could not get a new block of size: %i."),
                         i_blocks * CDIO_CD_FRAMESIZE_RAW );
         return NULL;
     }
@@ -536,7 +534,7 @@ static bool cdda_play_track( access_t *p_access, track_t i_track )
     p_cdda->i_track = i_track;
 
     /* set up the frame boundaries for this particular track */
-    p_cdda->first_frame = p_cdda->i_lsn = 
+    p_cdda->first_frame = p_cdda->i_lsn =
     cdio_get_track_lsn( p_cdda->p_cdio, i_track );
 
     p_cdda->last_frame  = cdio_get_track_lsn( p_cdda->p_cdio, i_track+1 ) - 1;
@@ -896,8 +894,8 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
          */
         case ACCESS_GET_META:
         {
-            vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
 #if 0
+            vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
             if( p_cdda->p_meta )
             {
                 *pp_meta = vlc_meta_Duplicate( p_cdda->p_meta );
@@ -1101,7 +1099,7 @@ static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda )
     return VLC_SUCCESS;
 }
 
-/* 
+/*
  * Local variables:
  *  mode: C
  *  style: gnu