CDDAX:

    - coding style fixes
    - adapted to new playlist API
    - only put generic things in Meta-information

wxWidgets:
    - Fixed playlist updating

core:
    - added playlist_ItemGetByInput
    - implemented input_item_t.b_fixed name : if this is set, the interface should not try to "improve" the display string.

include/vlc_input.h

@@ -62,6 +62,8 @@ struct input_item_t
     int         i_es;                /**< Number of es format descriptions */
     es_format_t **es;                /**< Pointer to an array of es formats */
 
+    vlc_bool_t  b_fixed_name;        /**< Can the interface change the name ?*/
+
     vlc_mutex_t lock;                /**< Item cannot be changed without this lock */
 };
 
@@ -85,6 +87,7 @@ static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
     p_i->pp_categories = 0;
     p_i->es = 0;
     p_i->i_type = ITEM_TYPE_UNKNOWN;
+    p_i->b_fixed_name = VLC_TRUE;
     vlc_mutex_init( p_o, &p_i->lock );
 }
 

modules/access/cdda/access.c

@@ -112,10 +112,12 @@ static void
 cddb_log_handler (cddb_log_level_t level, const char message[])
 {
     cdda_data_t *p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
-  switch (level) {
+    switch (level)
+    {
         case CDDB_LOG_DEBUG:
         case CDDB_LOG_INFO:
         if (!(p_cdda->i_debug & INPUT_DBG_CDDB)) return;
+
         /* Fall through if to warn case */
         default:
             cdio_log_handler (level, message);
@@ -135,11 +137,13 @@ uninit_log_handler (cdio_log_level_t level, const char message[])
     if (p_cdda_input)
         p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
-  switch (level) {
+     switch (level)
+     {
         case CDIO_LOG_DEBUG:
         case CDIO_LOG_INFO:
         if (!p_cdda || !(p_cdda->i_debug & (INPUT_DBG_CDIO|INPUT_DBG_CDDB)))
             return;
+
         /* Fall through if to warn case */
         case CDIO_LOG_WARN:
             fprintf(stderr, "WARN: %s\n", message);
@@ -151,8 +155,7 @@ uninit_log_handler (cdio_log_level_t level, const char message[])
             fprintf(stderr, "ASSERT ERROR: %s\n", message);
             break;
         default:
-    fprintf(stderr, "UNKNOWN ERROR: %s\n%s %d\n",
-            message,
+            fprintf(stderr, "UNKNOWN ERROR: %s\n%s %d\n", message,
                             "The above message had unknown cdio log level",
                             level);
     }
@@ -166,8 +169,7 @@ uninit_log_handler (cdio_log_level_t level, const char message[])
  * read. It is also possible if we haven't read a RIFF header in which
  * case one that we creaded during Open/Initialization is returned.
  *****************************************************************************/
-static block_t *
-CDDAReadBlocks( access_t * p_access )
+static block_t * CDDAReadBlocks( access_t * p_access )
 {
     block_t     *p_block;
     cdda_data_t *p_cdda   = (cdda_data_t *) p_access->p_sys;
@@ -246,8 +248,7 @@ CDDAReadBlocks( access_t * p_access )
  * CDDASeek - change position for subsequent reads. For example, this
  * can happen if the user moves a position slider bar in a GUI.
  ****************************************************************************/
-static int 
-CDDASeek( access_t * p_access, int64_t i_pos )
+static int CDDASeek( access_t * p_access, int64_t i_pos )
 {
     cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
 
@@ -269,8 +270,7 @@ CDDASeek( access_t * p_access, int64_t i_pos )
  * Open: open cdda device or image file and initialize structures
  *       for subsequent operations.
  *****************************************************************************/
-int
-E_(CDDAOpen)( vlc_object_t *p_this )
+int E_(CDDAOpen)( vlc_object_t *p_this )
 {
     access_t    *p_access = (access_t*)p_this;
     char *      psz_source = NULL;
@@ -319,12 +319,14 @@ E_(CDDAOpen)( vlc_object_t *p_this )
 
         psz_source = var_CreateGetString( p_this, "cd-audio" );
 
-	if( !psz_source || !*psz_source ) {
+        if( !psz_source || !*psz_source )
+        {
             /* Scan for a CD-ROM drive with a CD-DA in it. */
             char **cd_drives =
               cdio_get_devices_with_cap(NULL,  CDIO_FS_AUDIO, false);
 
-        if (NULL == cd_drives || NULL == cd_drives[0] ) {
+            if (NULL == cd_drives || NULL == cd_drives[0] )
+            {
                 msg_Err( p_access,
                      "libcdio couldn't find something with a CD-DA in it" );
                 if (cd_drives) cdio_free_device_list(cd_drives);
@@ -382,7 +384,8 @@ E_(CDDAOpen)( vlc_object_t *p_this )
         p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
 
     if ( p_cdda->i_blocks_per_read < MIN_BLOCKS_PER_READ
-	 || p_cdda->i_blocks_per_read > MAX_BLOCKS_PER_READ ) {
+         || p_cdda->i_blocks_per_read > MAX_BLOCKS_PER_READ )
+    {
         msg_Warn( p_cdda_input,
                 "Number of blocks (%d) has to be between %d and %d. "
                 "Using %d.",
@@ -392,7 +395,6 @@ E_(CDDAOpen)( vlc_object_t *p_this )
         p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
     }
 
-
     dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "%s", psz_source );
 
     /* Set up p_access */
@@ -439,6 +441,7 @@ E_(CDDAOpen)( vlc_object_t *p_this )
     /* PTS delay */
     var_Create( p_access, MODULE_STRING "-caching",
                 VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+    vlc_object_release( p_cdda->p_input );
     return VLC_SUCCESS;
 
  error:
@@ -446,6 +449,7 @@ E_(CDDAOpen)( vlc_object_t *p_this )
     free( p_cdda );
  error2:
     free( psz_source );
+    vlc_object_release( p_cdda->p_input );
     return i_rc;
 
 }
@@ -453,8 +457,7 @@ E_(CDDAOpen)( vlc_object_t *p_this )
 /*****************************************************************************
  * CDDAClose: closes cdda and frees any resources associded with it.
  *****************************************************************************/
-void
-E_(CDDAClose)( vlc_object_t *p_this )
+void E_(CDDAClose)( vlc_object_t *p_this )
 {
     access_t    *p_access = (access_t *) p_this;
     cdda_data_t *p_cdda   = (cdda_data_t *) p_access->p_sys;
@@ -505,15 +508,16 @@ 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 ( p_cdda->p_meta ) {
+            if ( p_cdda->p_meta )
+            {
                 *pp_meta = vlc_meta_Duplicate( p_cdda->p_meta );
                 dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
-	    } else 
+            }
+            else
                 msg_Warn( p_access, "tried to copy NULL meta info" );
 
             return VLC_SUCCESS;
         }
-	  return VLC_EGENERIC;
 
         case ACCESS_CAN_SEEK:
         case ACCESS_CAN_FASTSEEK:
@@ -522,14 +526,16 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
         {
             vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
             *pb_bool = VLC_TRUE;
-            break;
+            return VLC_SUCCESS;;
         }
 
         /* */
         case ACCESS_GET_MTU:
+        {
             pi_int = (int*)va_arg( args, int * );
             *pi_int = p_cdda-> i_blocks_per_read * CDIO_CD_FRAMESIZE_RAW;
             break;
+        }
 
         case ACCESS_GET_PTS_DELAY:
         {
@@ -544,14 +550,20 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
             break;
 
         case ACCESS_GET_TITLE_INFO:
-	  { input_title_t ***ppp_title;
+        {
+            input_title_t ***ppp_title;
             ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
             pi_int    = (int*)va_arg( args, int* );
             *((int*)va_arg( args, int* )) = 1; /* Title offset */
 
             /* Duplicate title info */
-	    /*** printf("+++ i_tracks %d, i_titles %d\n", 
-		 p_cdda->i_tracks, p_cdda->i_titles);  ***/
+            printf("+++ i_tracks %d, i_titles %d\n",
+                 p_cdda->i_tracks, p_cdda->i_titles);
+            if( p_cdda->i_titles == 0 )
+            {
+                *pi_int = 0; ppp_title = NULL;
+                return VLC_SUCCESS;
+            }
             *pi_int = p_cdda->i_titles;
             *ppp_title = malloc(sizeof( input_title_t **) * p_cdda->i_titles );
 
@@ -563,10 +575,11 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
                    (*ppp_title)[i] =
                           vlc_input_title_Duplicate( p_cdda->p_title[i] );
             }
-	  }
             break;
+        }
 
         case ACCESS_SET_TITLE:
+        {
             i = (int)va_arg( args, int );
             if( i != p_access->info.i_title )
             {
@@ -581,6 +594,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
                 p_cdda->i_lsn = p_cdda->lsn[p_cdda->i_first_track+i];
             }
             break;
+        }
 
         case ACCESS_SET_SEEKPOINT:
         case ACCESS_SET_PRIVATE_ID_STATE:
@@ -607,8 +621,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
 
  We return the VLC-type status, e.g. VLC_SUCCESS, VLC_ENOMEM, etc.
  *****************************************************************************/
-static int
-CDDAInit( access_t *p_access, cdda_data_t *p_cdda ) 
+static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda )
 {
     track_t i;
     discmode_t  discmode = CDIO_DISC_MODE_NO_INFO;

modules/access/cdda/callback.c

@@ -34,7 +34,8 @@ E_(CDDADebugCB)   ( vlc_object_t *p_this, const char *psz_name,
 
     p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
-  if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) {
+    if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) 
+    {
         msg_Dbg( p_cdda_input, "Old debug (x%0x) %d, new debug (x%0x) %d",
                  p_cdda->i_debug, p_cdda->i_debug, val.i_int, val.i_int);
     }
@@ -55,7 +56,8 @@ E_(CDDBEnabledCB)   ( vlc_object_t *p_this, const char *psz_name,
     p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
 #ifdef HAVE_LIBCDDB
-  if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) {
+    if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) 
+    {
         msg_Dbg( p_cdda_input, "Old CDDB Enabled (x%0x) %d, new (x%0x) %d",
                  p_cdda->b_cddb_enabled, p_cdda->b_cddb_enabled,
                  val.b_bool, val.b_bool);
@@ -75,7 +77,8 @@ E_(CDTextEnabledCB)   ( vlc_object_t *p_this, const char *psz_name,
 
     p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
-  if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) {
+    if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT))
+    {
         msg_Dbg( p_cdda_input, "Old CDText Enabled (x%0x) %d, new (x%0x) %d",
                  p_cdda->b_cdtext_enabled, p_cdda->b_cdtext_enabled,
                  val.b_bool, val.b_bool);
@@ -95,7 +98,8 @@ E_(CDTextPreferCB)   ( vlc_object_t *p_this, const char *psz_name,
     p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
 #ifdef HAVE_LIBCDDB
-  if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) {
+    if ( p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) 
+    {
         msg_Dbg( p_cdda_input, "Old CDText Prefer (x%0x) %d, new (x%0x) %d",
                  p_cdda->b_cdtext_prefer, p_cdda->b_cdtext_prefer,
                  val.b_bool, val.b_bool);
@@ -115,7 +119,8 @@ E_(CDDABlocksPerReadCB) ( vlc_object_t *p_this, const char *psz_name,
 
     p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
 
-  if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) {
+    if (p_cdda->i_debug & (INPUT_DBG_CALL|INPUT_DBG_EXT)) 
+    {
         msg_Dbg( p_cdda_input, "Old blocks per read: %d, new %d",
                  p_cdda->i_blocks_per_read, val.i_int);
     }
@@ -123,11 +128,11 @@ E_(CDDABlocksPerReadCB) ( vlc_object_t *p_this, const char *psz_name,
     if (0 == val.i_int) val.i_int = DEFAULT_BLOCKS_PER_READ;
     if ( val.i_int >= MIN_BLOCKS_PER_READ && val.i_int <= MAX_BLOCKS_PER_READ )
          p_cdda->i_blocks_per_read = val.i_int;
-  else {
+    else
+    {
         msg_Warn( p_cdda_input,
              "Number of blocks (%d) has to be between %d and %d. No change.",
               val.i_int, MIN_BLOCKS_PER_READ, MAX_BLOCKS_PER_READ );
     }
-  
     return VLC_SUCCESS;
 }

modules/access/cdda/info.h

@@ -33,17 +33,15 @@ int      CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
  we handle Meta Information requests and basically copy what we've
  saved here.
  */
-void     CDDAMetaInfo( access_t *p_access  );
+void     CDDAMetaInfo( access_t *p_access, int  );
+
 
 /*
  Creates a playlist item filling the meta information about that playlist
  item.
  */
-void     CDDACreatePlaylistItem(const access_t *p_access, 
-				cdda_data_t *p_cdda,
-				playlist_t *p_playlist, 
-				track_t i_track,
-				char *psz_mrl, int psz_mrl_max,
-				const char *psz_source, 
-				int playlist_operation,
-				int i_pos);
+playlist_item_t *
+CDDACreatePlaylistItem( const access_t *p_access, cdda_data_t *p_cdda,
+                        playlist_t *p_playlist, playlist_item_t *p_item,
+                        track_t i_track, char *psz_mrl, int psz_mrl_max,
+                        const char *psz_source );

src/input/input.c

@@ -1560,7 +1560,8 @@ static int  UpdateMeta( input_thread_t *p_input )
         msg_Dbg( p_input, "  - '%s' = '%s'",
                 _(p_meta->name[i]), p_meta->value[i] );
 
-        if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] )
+        if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] &&
+            !p_input->input.p_item->b_fixed_name )
             input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] );
 
         if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )

src/playlist/item-ext.c

@@ -436,6 +436,11 @@ playlist_item_t * playlist_ItemGetByInput( playlist_t * p_playlist ,
                                            input_item_t *p_item )
 {
     int i;
+    if( &p_playlist->status.p_item->input == p_item )
+    {
+        return p_playlist->status.p_item;
+    }
+
     for( i =  0 ; i < p_playlist->i_size ; i++ )
     {
         if( &p_playlist->pp_items[i]->input == p_item )