Cosmetic and initial support of sipr in rm demuxer. Doesn't work with all flavours...

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

diff --git a/modules/access/cdda/info.h b/modules/access/cdda/info.h
index e80bb81c6a638a0bc2970dff03c77f498dc8f0cd..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,32 +18,29 @@
  *
  * 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, 
-                           const char *psz_source, 
-                           vlc_bool_t b_single_track );
+ */
+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  );
+ saved here.
+ */
+void     CDDAMetaInfo( access_t *p_access, track_t i_track );
 
 /*
- 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);
+ Saves Meta Information about the CD-DA.
+
+ Saves information that CDDAMetaInfo uses. Should be called before
+ CDDAMetaInfo is called.
+ */
+void     CDDAMetaInfoInit( access_t *p_access );
+
+char *CDDAFormatTitle( const access_t *p_access, track_t i_track );
+