Go over information that gets set, yet again. Disc things are no longer

playlist-item information.

modules/access/cdda/access.c

@@ -580,7 +580,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
 	    } else {
   	       snprintf(psz_mrl, psz_mrl_max, "%s%s",
 			CDDA_MRL_PREFIX, p_cdda->psz_source);
-	       CDDAMetaInfo( p_access, -1, psz_mrl );
+	       CDDAMetaInfo( p_access, CDIO_INVALID_TRACK, psz_mrl );
 	       free(psz_mrl);
 	    }
 

modules/access/cdda/info.h

@@ -28,11 +28,12 @@ int      CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
                             vlc_bool_t b_single_track );
 
 /*
- Gets and saves CDDA Meta Information. In the Control routine,
+ Sets CDDA Meta Information. In the Control routine,
  we handle Meta Information requests and basically copy what we've
  saved here.
  */
-void     CDDAMetaInfo( access_t *p_access, int, /*const*/ char *psz_mrl  );
+void     CDDAMetaInfo( access_t *p_access, track_t i_track, 
+		       /*const*/ char *psz_mrl  );
 
 /*
  Saves Meta Information about the CD-DA.
@@ -40,7 +41,7 @@ void     CDDAMetaInfo( access_t *p_access, int, /*const*/ char *psz_mrl  );
  Saves information that CDDAMetaInfo uses. Should be called before
  CDDAMetaInfo is called.
  */
-void     CDDAMetaInfoInit( access_t *p_access, int i_track );
+void     CDDAMetaInfoInit( access_t *p_access );
 
 
 /*