Changeset 7e501d16ee2d458990cf27ac7d332572c91df856

Timestamp:

07/06/07 19:22:05 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1181236925 +0000

git-parent:

[19cc11fe0ed03ab20c1cc13cbc3c1020b574e31f]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1181236925 +0000

Message:

• Avoid a bunch of dummy string copy
  
• Use strdup() instead of asprintf("%s")
  
• Fix format string (CDDB now owns your CD player)
  

Files:

• modules/access/cdda.c (modified) (5 diffs)

modules/access/cdda.c

@@ -415 +415 @@
-
-    p_item_in_category = playlist_ItemToNode( p_playlist, p_parent, VLC_FALSE );
-    psz_name = strdup( "Audio CD" );
-    vlc_mutex_lock( &p_playlist->object_lock );
-psz_name
+"Audio CD"
-    vlc_mutex_unlock( &p_playlist->object_lock );
-    var_SetInteger( p_playlist, "item-change", p_parent->p_input->i_id );
-    free( psz_name );
-
-#ifdef HAVE_LIBCDDB
@@ -428 +426 @@
-        if( cddb_disc_get_title( p_sys->p_disc ) )
-        {
-asprintf( &psz_name, "%s", cddb_disc_get_title( p_sys->p_disc )
+const char *psz_name = cddb_disc_get_title( p_sys->p_disc
-            vlc_mutex_lock( &p_playlist->object_lock );
-            playlist_ItemSetName( p_parent, psz_name );
@@ -434 +432 @@
-            var_SetInteger( p_playlist, "item-change",
-                            p_parent->p_input->i_id );
-            free( psz_name );
-        }
-    }
@@ -485 +482 @@
-                    input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT),
-                                            _(VLC_META_TITLE),
-
+"%s", 
-                    if( p_input_item->psz_name )
-                        free( p_input_item->psz_name );
-
-
+
-                }
-                psz_result = cddb_track_get_artist( t );
@@ -495 +491 @@
-                {
-                    input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT),
-     _(VLC_META_ARTIST)
+_(VLC_META_ARTIST), "%s"
-                }
-            }