#include <vlc/vlc.h>
#ifndef WIN32
+#ifndef __BEOS__
#include <X11/Xlib.h>
#endif
+#endif
struct libvlc_instance_t
{
*****************************************************************************/
int E_(OpenMux)( vlc_object_t *p_this )
{
+ AVOutputFormat *file_oformat;
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys;
AVFormatParameters params, *ap = ¶ms;
av_register_all();
/* Find the requested muxer */
- AVOutputFormat *file_oformat =
+ file_oformat =
guess_format(NULL, p_mux->p_access->psz_name, NULL);
if (!file_oformat)
{
{
demux_sys_t *p_sys = p_demux->p_sys;
- INIT_PLAYLIST_STUFF;
-
- p_sys->p_playlist = p_playlist;
- p_sys->p_current = p_current;
- p_sys->i_parent_id = i_parent_id;
- p_sys->p_item_in_category = p_item_in_category;
-
char *psz_line;
char *psz_attrvalue;
char *psz_title = NULL;
char *psz_description = NULL;
+ INIT_PLAYLIST_STUFF;
+
+ p_sys->p_playlist = p_playlist;
+ p_sys->p_current = p_current;
+ p_sys->i_parent_id = i_parent_id;
+ p_sys->p_item_in_category = p_item_in_category;
+
while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
{
if( *psz_line == '#' )
/* Add the Show menu */
fShowMenu = new BMenu( _("Window") );
+#if 0
ADD_ELLIPSIS( _("Playlist") );
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PLAYLIST ), 'P') );
+#endif
ADD_ELLIPSIS( _("Messages") );
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_MESSAGES ), 'M' ) );
-#if 0
ADD_ELLIPSIS( _("Preferences") );
fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PREFERENCES ), 'S' ) );
-#endif
fMenuBar->AddItem( fShowMenu );
// add the media control view after the menubar is complete
playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
playlist_item_t *p_item )
{
+
+ playlist_item_t *p_item_in_category;
/* What we do
* Find the input in CATEGORY.
* - If we find it
return p_item;
/** \todo First look if we don't already have it */
- playlist_item_t *p_item_in_category = playlist_ItemFindFromInputAndRoot(
+ p_item_in_category = playlist_ItemFindFromInputAndRoot(
p_playlist, p_item->p_input->i_id,
p_playlist->p_root_category );