Changeset 3876aaa761ba9ef1914a10591ecf0a1cbfcee6bc

Timestamp:

17/05/06 21:38:53 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1147894733 +0000

git-parent:

[f0a9192492ee9edc9c01314bdc543c835d7e8972]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1147894733 +0000

Message:

* This makes the cddax and vcdx modules compile again. meta is disabled. functionality is untested.
refs #649

Files:

• modules/access/cdda/access.c (modified) (2 diffs)
• modules/access/cdda/info.c (modified) (9 diffs)
• modules/access/vcdx/access.c (modified) (2 diffs)

modules/access/cdda/access.c

@@ -885 +885 @@
-        {
-            vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
-
+
+
-            {
-                *pp_meta = vlc_meta_Duplicate( p_cdda->p_meta );
@@ -891 +892 @@
-        return VLC_SUCCESS;
-            }
-
+
+
+
-            msg_Warn( p_access, "tried to copy NULL meta info" );
-        return VLC_EGENERIC;

modules/access/cdda/info.c

@@ -159 +159 @@
-#define add_meta_val(VLC_META, VAL)                 \
-  if ( p_cdda->p_meta && VAL) {                                         \
-vlc_meta_Add( p_cdda->p_meta, VLC_META, VAL );
+/*vlc_meta_Add( p_cdda->p_meta, VLC_META, VAL );*/
-    dbg_print( INPUT_DBG_META, "field %s: %s\n", VLC_META, VAL );       \
-  }                                                                     \
@@ -236 +236 @@
-
-    p_cdda->psz_mcn = cdio_get_mcn(p_cdda->p_cdio);
+#if 0
-    p_cdda->p_meta = vlc_meta_New();
+#endif
-
-#ifdef HAVE_LIBCDDB
@@ -820 +822 @@
-                        track_t i_track )
-{
-
-
-
-
-
+
+
+
+
-    char *psz_title = NULL;
-    char *psz_mrl   = NULL;
@@ -839 +840 @@
-
-    p_child = playlist_ItemNew( p_playlist, psz_mrl, psz_title );
-input.i_duration   =
+p_input->i_duration = (mtime_t)
-    free(psz_mrl);
-    free(psz_title);
-
-    if( !p_child ) return NULL;
-
+
-    playlist_NodeAddItem( p_playlist, p_child,
-p_parents[0]
+_parent
-                          p_item, PLAYLIST_APPEND, PLAYLIST_END );
-    playlist_CopyParents( p_item, p_child );
-
+
-    return p_child;
-}
@@ -857 +858 @@
-                       vlc_bool_t b_single )
-{
+#if 0
-    add_playlist_track_info_str("Source",  p_cdda->psz_source);
-    vlc_input_item_AddInfo( &p_item->input, _("Track"), _("Track Number"),
@@ -900 +902 @@
-    }
-#endif /*HAVE_LIBCDDB*/
-
+
-    return VLC_SUCCESS;
-}
@@ -981 +983 @@
-        t->i_length = I64C(1000000) * t->i_size / CDDA_FREQUENCY_SAMPLE / 4;
-
-
-
+
-    {
-        CDDAAddMetaToItem( p_access, p_cdda, p_item, i_track, VLC_FALSE );
-input.i_duration =
+p_input->i_duration = (mtime_t)
-          * (CLOCK_FREQ / CDIO_CD_FRAMES_PER_SEC);
-input.psz_uri    = CDDAFormatMRL(p_access, i_track
+p_input->psz_uri = CDDAFormatMRL( p_access, i_track 
-    }
-    
@@ -1026 +1027 @@
-        p_cdda->i_titles = p_cdda->i_tracks;
-    p_access->info.i_update |= INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
-
-
+
+
+
-          p_access->info.i_size * (CLOCK_FREQ / CDIO_CD_FRAMES_PER_SEC) ;
-
-
+
-    }
-    }
@@ -1037 +1038 @@
-    if( b_play )
-    {
-
-
+
-                          p_playlist->status.p_item, NULL );
-    }

modules/access/vcdx/access.c

@@ -903 +903 @@
-                                                      VLC_OBJECT_INPUT,
-                                                      FIND_PARENT );
-
+//
-    p_vcdplayer->p_segments        = NULL;
-    p_vcdplayer->p_entries         = NULL;
@@ -1038 +1038 @@
-
-            dbg_print( INPUT_DBG_EVENT, "get meta info" );
-
-
-
-
-
+
+
+
+
+
+
+
+
-              msg_Warn( p_access, "tried to copy NULL meta info" );
-