X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda%2Finfo.h;h=0da55e72c4234d8a4118ed175c24ba6d6a3b9e78;hb=10a6bde56813620846826fed6979b2548a6457ea;hp=5d0bbe6a9b46d616220958ffe6fbd3546175924d;hpb=c91e463ac3e9b7b7e71c824a39d7ca928cf61e1b;p=vlc

diff --git a/modules/access/cdda/info.h b/modules/access/cdda/info.h
index 5d0bbe6a9b..0da55e72c4 100644
--- a/modules/access/cdda/info.h
+++ b/modules/access/cdda/info.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * info.h : CD digital audio input information routine headers
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: info.h 8606 2004-08-31 18:32:54Z rocky $
+ * Copyright (C) 2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *
@@ -18,21 +18,21 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*
  Fills out playlist information.
  */
 int      CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
-                            vlc_bool_t b_single_track );
+                            bool 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 );
 
 /*
  Saves Meta Information about the CD-DA.
@@ -40,14 +40,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 );
 
+char *CDDAFormatTitle( const access_t *p_access, track_t i_track );
 
-/*
- Creates a playlist item filling the meta information about that playlist
- item.
- */
-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 );