Commit 511ab83d authored by Rocky Bernstein's avatar Rocky Bernstein

If not in PBC, playlist fills in all entries.

Fill in playlist info. Customizable "title" and "author" field.
Still need to pick out and duration field.
A couple of segfaults fixed.
parent 3d11590e
This diff is collapsed.
......@@ -2,7 +2,7 @@
* vcd.c : VCD input module for vlc
*****************************************************************************
* Copyright (C) 2000,2003 VideoLAN
* $Id: vcd.c,v 1.11 2003/12/11 12:56:25 rocky Exp $
* $Id: vcd.c,v 1.12 2003/12/13 12:56:14 rocky Exp $
*
* Authors: Rocky Bernstein <rocky@panix.com>
*
......@@ -64,6 +64,25 @@ int E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
"still (400) 1024\n" \
"vcdinfo (800) 2048\n" )
#define VCD_TITLE_FMT_LONGTEXT N_( \
"Format used in the GUI Playlist Title. Similar to the Unix date \n" \
"Format specifiers that start with a percent sign. Specifiers are: \n" \
" %A : The album information\n" \
" %C : The VCD volume count - the number of CD's in the collection\n" \
" %c : The VCD volume num - the number of the CD in the collection.\n" \
" %F : The VCD Format, e.g. VCD 1.0, VCD 1.1, VCD 2.0, or SVC\n" \
" %I : The current entry/segment/playback type, e.g. ENTRY, TRACK, SEGMENT..\n" \
" %L : The playlist ID prefixed with ' LID' if it exists\n" \
" %N : The current number of the %I - a decimal number\n" \
" %P : The publisher ID\n" \
" %p : The preparer I\n" \
" %S : If we are in a segment (menu), the kind of segment\n" \
" %T : The track numbe\n" \
" %V : The volume set I\n" \
" %v : The volume I\n" \
" A number between 1 and the volume count.\n" \
" %% : a % \n")
/*****************************************************************************
* Module descriptor
*****************************************************************************/
......@@ -89,6 +108,18 @@ vlc_module_begin();
"Otherwise we play by tracks."),
VLC_TRUE );
add_string( MODULE_STRING "-author-format",
"%v - %F disc %c of %C",
NULL,
N_("Format to use in playlist 'author'"),
VCD_TITLE_FMT_LONGTEXT, VLC_TRUE );
add_string( MODULE_STRING "-title-format",
"%I %N%L%S - %M",
NULL,
N_("Format to use in playlist 'title' field"),
VCD_TITLE_FMT_LONGTEXT, VLC_TRUE );
#ifdef FIXED
add_submodule();
set_capability( "demux", 0 );
......
......@@ -3,7 +3,7 @@
* using libcdio, libvcd and libvcdinfo
*****************************************************************************
* Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
* $Id: vcdplayer.c,v 1.8 2003/12/11 05:31:37 rocky Exp $
* $Id: vcdplayer.c,v 1.9 2003/12/13 12:56:14 rocky Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -90,19 +90,7 @@ vcdplayer_non_pbc_nav ( input_thread_t * p_input )
dbg_print( INPUT_DBG_LSN, "new track %d, lsn %d", p_vcd->cur_track,
p_vcd->p_sectors[p_vcd->cur_track+1] );
if ( p_vcd->cur_track >= p_vcd->num_tracks - 1 )
return READ_END; /* EOF */
p_vcd->play_item.num = p_vcd->cur_track++;
vlc_mutex_lock( &p_input->stream.stream_lock );
p_area = p_input->stream.pp_areas[p_vcd->cur_track];
p_area->i_part = 1;
VCDSetArea( p_input, p_area );
vlc_mutex_unlock( &p_input->stream.stream_lock );
return READ_BLOCK;
return READ_END;
break;
}
case VCDINFO_ITEM_TYPE_SPAREID2:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment