revert [23722]

[vlc] / modules / access / cdda / info.h

diff --git a/modules/access/cdda/info.h b/modules/access/cdda/info.h
index 57dfb8c9f112c644bb3c4d8fdbd2b35fdc1376f1..5469200f5e6e3af0443e078effe41e279f406831 100644 (file)
--- 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,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*
@@ -32,8 +32,7 @@ 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, track_t i_track, 
-                      /*const*/ char *psz_mrl  );
+void     CDDAMetaInfo( access_t *p_access, track_t i_track );
 
 /*
  Saves Meta Information about the CD-DA.
@@ -43,12 +42,5 @@ void     CDDAMetaInfo( access_t *p_access, track_t 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 );