src/interface/interface.c \
src/interface/intf_eject.c \
src/playlist/playlist.c \
+ src/playlist/sort.c \
+ src/playlist/loadsave.c \
+ src/playlist/group.c \
+ src/playlist/item.c \
src/input/input.c \
src/input/stream.c \
src/input/demux.c \
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.84 2003/10/29 01:33:27 gbazin Exp $
+ * $Id: vlc_common.h,v 1.85 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
/* Playlist */
typedef struct playlist_t playlist_t;
typedef struct playlist_item_t playlist_item_t;
+typedef struct playlist_group_t playlist_group_t;
/* Modules */
typedef struct module_bank_t module_bank_t;
* vlc_help.h: Help strings
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: vlc_help.h,v 1.3 2003/10/08 19:40:42 gbazin Exp $
+ * $Id: vlc_help.h,v 1.4 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Anil Daoud <anil@videolan.org>
#define AOUT_TITLE N_("Audio output modules settings")
#define AOUT_HELP N_("These are general settings for audio output modules.")
+#define AOUT_ENC_TITLE N_("Audio encoders settings")
+#define AOUT_ENC_HELP N_("These are general settings for audio encoding modules.")
+
#define CHROMA_TITLE N_("Chroma modules settings")
#define CHROMA_HELP N_(" ")
* interface, such as message output.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: vlc_interface.h,v 1.7 2003/10/14 22:41:41 gbazin Exp $
+ * $Id: vlc_interface.h,v 1.8 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
#define INTF_DIALOG_NET 4
#define INTF_DIALOG_SAT 5
+#define INTF_DIALOG_STREAM 8
+
#define INTF_DIALOG_PLAYLIST 10
#define INTF_DIALOG_MESSAGES 11
#define INTF_DIALOG_FILEINFO 12
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_playlist.h,v 1.14 2003/10/06 16:23:30 zorglub Exp $
+ * $Id: vlc_playlist.h,v 1.15 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
char * psz_author; /**< Author */
};
+struct playlist_group_t
+{
+ char * psz_name; /**< name of the group */
+ int i_id; /**< Identifier for the group */
+};
+
/**
* Playlist status
*/
int i_enabled; /**< How many items are enabled ? */
playlist_item_t ** pp_items; /**< array of pointers to the
* playlist items */
-
+ int i_groups; /**< How many groups are in the playlist */
+ playlist_group_t ** pp_groups;/**< array of pointers to the playlist
+ * groups */
+ int i_max_id; /**< Maximal group id given */
input_thread_t * p_input; /**< the input thread ascosiated
* with the current item */
/*@}*/
#define SORT_NORMAL 0
#define SORT_REVERSE 1
-#define PLAYLIST_TYPE_MANUAL 0
-#define PLAYLIST_TYPE_SAP 1
+#define PLAYLIST_TYPE_MANUAL 1
+#define PLAYLIST_TYPE_SAP 2
/*****************************************************************************
* Prototypes
VLC_EXPORT( int, playlist_Enable, ( playlist_t *, int ) );
VLC_EXPORT( int, playlist_DisableGroup, ( playlist_t *, int ) );
VLC_EXPORT( int, playlist_EnableGroup, ( playlist_t *, int ) );
-VLC_EXPORT( int, playlist_Sort, ( playlist_t *, int) );
+
+VLC_EXPORT( playlist_group_t *, playlist_CreateGroup, (playlist_t *, char* ) );
+VLC_EXPORT( int, playlist_DeleteGroup, (playlist_t *, int ) );
+VLC_EXPORT( char *, playlist_FindGroup, (playlist_t *, int ) );
+
+VLC_EXPORT( int, playlist_SortTitle, ( playlist_t *, int) );
+VLC_EXPORT( int, playlist_SortAuthor, ( playlist_t *, int) );
+VLC_EXPORT( int, playlist_SortGroup, ( playlist_t *, int) );
+
VLC_EXPORT( int, playlist_Move, ( playlist_t *, int, int ) );
VLC_EXPORT( int, playlist_LoadFile, ( playlist_t *, const char * ) );
VLC_EXPORT( int, playlist_SaveFile, ( playlist_t *, const char * ) );
* slp.c: SLP access plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: slp.c,v 1.16 2003/09/14 16:41:48 zorglub Exp $
+ * $Id: slp.c,v 1.17 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Loïc Minier <lool@videolan.org>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
static void End ( vlc_object_t * );
static int Demux ( input_thread_t * );
+int i_group;
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
/* or there was a problem with getting the data we requested */
if( (slpe_errcode != SLP_OK) )
{
-/* msg_Err( (vlc_object_t*)NULL,
+#if 0
+ msg_Err( (vlc_object_t*)NULL,
"AttrCallback got an error %i with attribute %s",
slpe_errcode,
- psz_attrlist ); */
+ psz_attrlist );
+#endif
return SLP_TRUE;
}
{
return SLP_TRUE;
}
-
+
msg_Dbg(p_input,"URL: %s",psz_srvurl);
/* or there was a problem with getting the data we requested */
p_playlist_item->b_autodeletion = VLC_FALSE;
p_playlist_item->i_options = 0;
p_playlist_item->ppsz_options = 0;
+ p_playlist_item->psz_author = NULL;
+ p_playlist_item->i_group = i_group;
+ p_playlist_item->b_enabled = VLC_TRUE;
/* search the description of the stream */
if( SLPOpen( config_GetPsz( p_input, "slp-lang" ),
{
return SLP_TRUE;
}
-
+
msg_Dbg(p_input,"Services: %s",psz_srvurl);
/* or there was a problem with getting the data we requested */
if(!psz_eos) break;
if(!strncasecmp(psz_eos+1,"service:",8)) break;
}
-
- if(psz_eos)
+
+ if(psz_eos)
*psz_eos = '\0';
psz_service = strdup( psz_srvurl);
-
+
msg_Dbg(p_input,"Getting details for %s",psz_service);
-
+
slpe_result = SLPFindSrvs( slph_slp2,
psz_service,
config_GetPsz( p_input, "slp-scopelist" ),
if(psz_eos)
psz_srvurl = psz_eos;
-
-// SLPClose( slph_slp2 );
+#if 0
+ SLPClose( slph_slp2 );
+#endif
if( slpe_result != SLP_OK )
{
msg_Err( p_input,
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- SLPError slpe_result;
- SLPHandle slph_slp;
- playlist_t * p_playlist;
+ input_thread_t * p_input = (input_thread_t *)p_this;
+ SLPError slpe_result;
+ SLPHandle slph_slp;
+ playlist_t * p_playlist;
+ playlist_group_t * p_group;
/* remove the "slp:" entry of the playlist */
p_playlist = (playlist_t *) vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
return VLC_FALSE;
}
+ p_group = playlist_CreateGroup( p_playlist , "SLP" );
+ i_group = p_group->i_id;
p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
vlc_object_release( (vlc_object_t *)p_playlist );
* id3tag.c: id3 tag parser/skipper based on libid3tag
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: id3tag.c,v 1.13 2003/10/25 00:49:14 sam Exp $
+ * $Id: id3tag.c,v 1.14 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
return;
}
+ val.b_bool = VLC_FALSE;
p_id3_tag = id3_tag_parse( p_data, i_size );
p_category = input_InfoCategory( p_input, "ID3" );
i = 0;
i_genre = strtol( psz_temp, &psz_endptr, 10 );
if( psz_temp != psz_endptr && i_genre >= 0 && i_genre < NUM_GENRES )
{
- input_AddInfo( p_category, (char *)p_frame->description, ppsz_genres[atoi(psz_temp)]);
+ input_AddInfo( p_category, (char *)p_frame->description,
+ ppsz_genres[atoi(psz_temp)]);
}
else
{
- input_AddInfo( p_category, (char *)p_frame->description, psz_temp );
+ input_AddInfo( p_category, (char *)p_frame->description,
+ psz_temp );
}
}
else if ( !strcmp(p_frame->id, ID3_FRAME_TITLE ) )
{
- p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
+ p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+ FIND_PARENT );
if( p_playlist )
{
- p_playlist->pp_items[p_playlist->i_index]->psz_name = strdup( psz_temp );
+ p_playlist->pp_items[p_playlist->i_index]->psz_name =
+ strdup( psz_temp );
+ val.b_bool = VLC_TRUE;
vlc_object_release( p_playlist );
}
- input_AddInfo( p_category, (char *)p_frame->description, psz_temp );
+ input_AddInfo( p_category, (char *)p_frame->description,
+ psz_temp );
}
else if ( !strcmp(p_frame->id, ID3_FRAME_ARTIST ) )
{
- p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT );
+ p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+ FIND_PARENT );
if( p_playlist )
{
- p_playlist->pp_items[p_playlist->i_index]->psz_author = strdup( psz_temp );
+ p_playlist->pp_items[p_playlist->i_index]->psz_author =
+ strdup( psz_temp );
+ val.b_bool = VLC_TRUE;
vlc_object_release( p_playlist );
}
- input_AddInfo( p_category, (char *)p_frame->description, psz_temp );
+ input_AddInfo( p_category, (char *)p_frame->description,
+ psz_temp );
}
else
{
- input_AddInfo( p_category, (char *)p_frame->description, psz_temp );
+ input_AddInfo( p_category, (char *)p_frame->description,
+ psz_temp );
}
free( psz_temp );
}
i++;
}
id3_tag_delete( p_id3_tag );
+ if(val.b_bool == VLC_TRUE )
+ {
+ p_playlist = vlc_object_find( p_input,
+ VLC_OBJECT_PLAYLIST, FIND_PARENT );
+ if( p_playlist )
+ {
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+ vlc_object_release( p_playlist );
+ }
+ }
val.b_bool = VLC_TRUE;
var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL );
}
dialogs.cpp \
open.cpp \
streamout.cpp \
+ stream.cpp \
messages.cpp \
playlist.cpp \
iteminfo.cpp \
* dialogs.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: dialogs.cpp,v 1.9 2003/10/15 12:24:14 gbazin Exp $
+ * $Id: dialogs.cpp,v 1.10 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
DialogsProvider::OnMessages)
EVT_COMMAND(INTF_DIALOG_PREFS, wxEVT_DIALOG,
DialogsProvider::OnPreferences)
+ EVT_COMMAND(INTF_DIALOG_STREAM, wxEVT_DIALOG,
+ DialogsProvider::OnStreamDialog)
EVT_COMMAND(INTF_DIALOG_FILEINFO, wxEVT_DIALOG,
DialogsProvider::OnFileInfo)
EVT_COMMAND(INTF_DIALOG_POPUPMENU, wxEVT_DIALOG,
p_fileinfo_dialog = NULL;
p_prefs_dialog = NULL;
p_file_generic_dialog = NULL;
+ p_stream_dialog = NULL;
/* Give our interface a nice little icon */
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
if( p_messages_dialog ) delete p_messages_dialog;
if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
if( p_file_generic_dialog ) delete p_file_generic_dialog;
+ if( p_stream_dialog ) delete p_stream_dialog;
+
if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
}
}
+void DialogsProvider::OnStreamDialog( wxCommandEvent& WXUNUSED(event) )
+{
+ /* Show/hide the stream window */
+ if( !p_stream_dialog )
+ p_stream_dialog = new StreamDialog( p_intf, this );
+
+ if( p_stream_dialog )
+ {
+ p_stream_dialog->Show( !p_stream_dialog->IsShown() );
+ }
+}
+
void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
{
intf_dialog_args_t *p_arg = (intf_dialog_args_t *)event.GetClientData();
{
/* Show/hide the open dialog */
if( !p_open_dialog )
- p_open_dialog = new OpenDialog( p_intf, this, i_access_method, i_arg );
+ p_open_dialog = new OpenDialog(p_intf, this, i_access_method, i_arg ,
+ OPEN_NORMAL );
if( p_open_dialog )
{
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.68 2003/10/29 01:33:27 gbazin Exp $
+ * $Id: interface.cpp,v 1.69 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
/* include the toolbar graphics */
#include "bitmaps/file.xpm"
+
+#include "bitmaps/stream.xpm"
+
#include "bitmaps/disc.xpm"
#include "bitmaps/net.xpm"
#if 0
-#include "bitmaps/sat.xpm"
+ #include "bitmaps/sat.xpm"
#endif
#include "bitmaps/play.xpm"
#include "bitmaps/pause.xpm"
#include "bitmaps/fast.xpm"
#include "bitmaps/slow.xpm"
+#include <wx/listctrl.h>
+
#define TOOLBAR_BMP_WIDTH 36
#define TOOLBAR_BMP_HEIGHT 36
enum
{
/* menu items */
+ MenuDummy_Event = wxID_HIGHEST + 1000,
Exit_Event = wxID_HIGHEST,
OpenFileSimple_Event,
+ OpenAdv_Event,
OpenFile_Event,
OpenDisc_Event,
OpenNet_Event,
OpenSat_Event,
+ OpenOther_Event,
EjectDisc_Event,
+ Stream_Event,
+
Playlist_Event,
Logs_Event,
FileInfo_Event,
Saturation_Event,
Ratio_Event,
+ Visual_Event,
+
/* it is important for the id corresponding to the "About" command to have
* this standard value as otherwise it won't be handled properly under Mac
* (where it is special and put into the "Apple" menu) */
EVT_CHECKBOX( Adjust_Event, Interface::OnEnableAdjust)
EVT_COMBOBOX( Ratio_Event, Interface::OnRatio)
+ EVT_CHECKBOX( Visual_Event, Interface::OnEnableVisual)
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
EVT_CONTEXT_MENU(Interface::OnContextMenu2)
/* Toolbar events */
EVT_MENU(OpenFileSimple_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenAdv_Event, Interface::OnShowDialog)
EVT_MENU(OpenFile_Event, Interface::OnShowDialog)
EVT_MENU(OpenDisc_Event, Interface::OnShowDialog)
EVT_MENU(OpenNet_Event, Interface::OnShowDialog)
EVT_MENU(OpenSat_Event, Interface::OnShowDialog)
+ EVT_MENU(Stream_Event, Interface::OnStream)
EVT_MENU(StopStream_Event, Interface::OnStopStream)
EVT_MENU(PlayStream_Event, Interface::OnPlayStream)
EVT_MENU(PrevStream_Event, Interface::OnPrevStream)
SetIcon( wxIcon( vlc_xpm ) );
/* Create a sizer for the main frame */
- //frame_sizer= new wxFlexGridSizer( 1, 0, 0);
frame_sizer = new wxBoxSizer( wxVERTICAL );
SetSizer( frame_sizer );
*****************************************************************************/
void Interface::CreateOurMenuBar()
{
+#define HELP_SIMPLE N_("Quick file open")
+#define HELP_ADV N_("Advanced open")
#define HELP_FILE N_("Open a file")
#define HELP_DISC N_("Open a DVD or (S)VCD")
#define HELP_NET N_("Open a network stream")
#define HELP_EJECT N_("Eject the DVD/CD")
#define HELP_EXIT N_("Exit this program")
+#define HELP_STREAM N_("Streaming wizard")
+#define HELP_OTHER N_("Open other types of inputs")
+
#define HELP_PLAYLIST N_("Open the playlist")
#define HELP_LOGS N_("Show the program logs")
#define HELP_FILEINFO N_("Show information about the file being played")
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
file_menu->Append( OpenFileSimple_Event, wxU(_("Simple &Open ...")),
- wxU(_(HELP_FILE)) );
+ wxU(_(HELP_SIMPLE)) );
+
+ file_menu->AppendSeparator();
file_menu->Append( OpenFile_Event, wxU(_("Open &File...")),
- wxU(_(HELP_FILE)) );
+ wxT(_(HELP_FILE)));
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")),
- wxU(_(HELP_DISC)) );
+ wxT(_(HELP_DISC)));
file_menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")),
- wxU(_(HELP_NET)) );
+ wxT(_(HELP_NET)));
+
#if 0
file_menu->Append( OpenSat_Event, wxU(_("Open &Satellite Stream...")),
wxU(_(HELP_NET)) );
#endif
-#if 0
file_menu->AppendSeparator();
- file_menu->Append( EjectDisc_Event, wxU(_("&Eject Disc")),
- wxU(_(HELP_EJECT)) );
-#endif
+ file_menu->Append( Stream_Event, wxU(_("Streaming Wizard...")),
+ wxU(_(HELP_STREAM)) );
file_menu->AppendSeparator();
file_menu->Append( Exit_Event, wxU(_("E&xit")), wxU(_(HELP_EXIT)) );
void Interface::CreateOurToolBar()
{
#define HELP_STOP N_("Stop current playlist item")
+
#define HELP_PLAY N_("Play current playlist item")
#define HELP_PAUSE N_("Pause current playlist item")
#define HELP_PLO N_("Open playlist")
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
+ toolbar->AddTool( OpenFileSimple_Event, wxU(_("Simple open")), wxBitmap( file_xpm ),
+ wxU(_(HELP_SIMPLE)) );
+
+ toolbar->AddSeparator();
+
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ),
wxU(_(HELP_SAT)) );
#endif
toolbar->AddSeparator();
+
+ toolbar->AddTool( Stream_Event, wxU(_("Stream")), wxBitmap( stream_xpm ),
+ wxU(_(HELP_STREAM)) );
+
+ toolbar->AddSeparator();
+
toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ),
wxBoxSizer *extra_sizer = new wxBoxSizer( wxHORIZONTAL );
/* Create static box to surround the adjust controls */
- adjust_box = new wxStaticBox( extra_frame, -1, wxU(_("Image adjust")) );
+ wxStaticBox *adjust_box =
+ new wxStaticBox( extra_frame, -1, wxU(_("Image adjust")) );
/* Create the size for the frame */
wxStaticBoxSizer *adjust_sizer =
extra_sizer->Add(adjust_sizer,1,wxBOTTOM,5);
- /* Create static box to surround the other controls */
- other_box = new wxStaticBox( extra_frame, -1, wxU(_("Video Options")) );
+ /* Create sizer to surround the other controls */
+ wxBoxSizer *other_sizer = new wxBoxSizer( wxVERTICAL );
+
+ wxStaticBox *video_box =
+ new wxStaticBox( extra_frame, -1, wxU(_("Video Options")) );
/* Create the sizer for the frame */
- wxStaticBoxSizer *other_sizer =
- new wxStaticBoxSizer( other_box, wxVERTICAL );
- other_sizer->SetMinSize( -1, 50 );
+ wxStaticBoxSizer *video_sizer =
+ new wxStaticBoxSizer( video_box, wxVERTICAL );
+ video_sizer->SetMinSize( -1, 50 );
static const wxString ratio_array[] =
{
ratio_sizer->Add( ratio_combo, 0, wxALL, 2 );
ratio_sizer->Layout();
- other_sizer->Add(ratio_sizer,0,wxALL,0 );
+ video_sizer->Add( ratio_sizer , 0 , wxALL , 0 );
+ video_sizer->Layout();
+
+ wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
+ wxU(_("Visualisation")) );
+
+ visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
+ visual_sizer->Layout();
+
+ wxStaticBox *audio_box =
+ new wxStaticBox( extra_frame, -1, wxU(_("Audio Options")) );
+ /* Create the sizer for the frame */
+ wxStaticBoxSizer *audio_sizer =
+ new wxStaticBoxSizer( audio_box, wxVERTICAL );
+ audio_sizer->SetMinSize( -1, 50 );
+
+ audio_sizer->Add( visual_sizer, 0, wxALL, 0);
+ audio_sizer->Layout();
+
+ other_sizer->Add( video_sizer, 0, wxALL | wxEXPAND , 0);
+ other_sizer->Add( audio_sizer , 0 , wxALL | wxEXPAND , 0 );
+ other_sizer->Layout();
extra_sizer->Add(other_sizer,0,wxBOTTOM,5);
extra_sizer->SetSizeHints(extra_frame);
/* Write down initial values */
+
+ if( strstr( config_GetPsz( p_intf, "audio-filter" ), "visual" ) )
+ {
+ visual_checkbox->SetValue(1);
+ }
+
psz_filters = config_GetPsz( p_intf, "filter" );
if(psz_filters == NULL) psz_filters=strdup("");
msg.Printf( wxString(wxT("VLC media player " VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
- wxU( INTF_ABOUT_MSG ) + wxT("\n\n") +
+ wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) );
case OpenFileSimple_Event:
i_id = INTF_DIALOG_FILE_SIMPLE;
break;
+ case OpenAdv_Event:
+ i_id = INTF_DIALOG_FILE;
case OpenFile_Event:
i_id = INTF_DIALOG_FILE;
break;
}
}
+
+void Interface::OnStream( wxCommandEvent& event )
+{
+ StreamDialog *p_stream_dialog = new StreamDialog(p_intf,this);
+ p_stream_dialog->Show();
+}
+
+
void Interface::OnExtra(wxCommandEvent& event)
{
if( b_extra == VLC_FALSE)
config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue().mb_str() );
}
+void Interface::OnEnableVisual(wxCommandEvent& event)
+{
+ if( event.IsChecked() )
+ {
+ config_PutPsz( p_intf, "audio-filter", "visual" );
+ }
+ else
+ {
+ config_PutPsz( p_intf, "audio-filter", "" );
+ }
+}
+
void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
{
wxCommandEvent dummy;
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
var_Set( p_playlist->p_input, "next-title", val );
vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ vlc_object_release( p_playlist );
return;
}
vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
if( i_playing_status == PLAYING_S )
{
- GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Pause")),
+ GetToolBar()->InsertTool( 8, PlayStream_Event, wxU(_("Pause")),
wxBitmap( pause_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
}
else
{
- GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Play")),
+ GetToolBar()->InsertTool( 8, PlayStream_Event, wxU(_("Play")),
wxBitmap( play_xpm ), wxNullBitmap,
wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
}
* iteminfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: iteminfo.cpp,v 1.2 2003/10/06 17:41:47 gbazin Exp $
+ * $Id: iteminfo.cpp,v 1.3 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
Name_Event,
Author_Event,
Enabled_Event,
+ New_Event,
};
BEGIN_EVENT_TABLE(ItemInfoDialog, wxDialog)
/* Button events */
EVT_BUTTON(wxID_OK, ItemInfoDialog::OnOk)
EVT_BUTTON(wxID_CANCEL, ItemInfoDialog::OnCancel)
-
/* Events generated by the panels */
+ EVT_BUTTON( New_Event, ItemInfoDialog::OnNewGroup)
END_EVENT_TABLE()
{
wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
wxDefaultSize );
-
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
wxU(_("Group Info")) );
-
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL);
-
wxBoxSizer *subpanel_sizer;
-
group_subpanel = new wxPanel( panel, -1 );
-
subpanel_sizer = new wxBoxSizer( wxVERTICAL) ;
-
enabled_checkbox = new wxCheckBox( group_subpanel,
- -1,
- wxU(_("Item enabled")) );
+ -1, wxU(_("Item enabled")) );
enabled_checkbox->SetValue( p_item->b_enabled);
wxStaticText *group_label = new wxStaticText( group_subpanel,
-1, wxU(_("Group")) );
- group_spin = new wxSpinCtrl( group_subpanel,
- -1 );
- group_spin->SetValue( p_item->i_group > 0 ? p_item->i_group : 0);
+
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ {
+ return NULL;
+ }
+
+ group_combo = new wxComboBox( group_subpanel, -1,
+ wxT(""),wxDefaultPosition, wxDefaultSize,
+ 0, NULL,
+ wxCB_READONLY );
+
+ wxButton *newgroup_button = new wxButton( group_subpanel, New_Event,
+ wxT(_("New Group")));
+
+ for( int i=0; i< p_playlist->i_groups ; i++)
+ {
+ group_combo->Append( wxT( p_playlist->pp_groups[i]->psz_name));
+ }
+
+ vlc_object_release ( p_playlist );
subpanel_sizer->Add( enabled_checkbox, 0, wxALIGN_RIGHT|
wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( group_label, 0, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL );
- subpanel_sizer->Add( group_spin, 0, wxALIGN_RIGHT );
+
+ wxBoxSizer *group_sizer = new wxBoxSizer( wxHORIZONTAL);
+ group_sizer->Add(group_combo, 0, wxALIGN_LEFT|wxRIGHT, 5);
+ group_sizer->Add( newgroup_button, 0, wxALIGN_RIGHT|wxLEFT, 5);
+ group_sizer->Layout();
+
+ subpanel_sizer->Add( group_sizer, 0, wxALIGN_RIGHT );
group_subpanel->SetSizerAndFit( subpanel_sizer );
/* Stuff everything into the main panel */
- panel_sizer->Add( group_subpanel, 0,
+ panel_sizer->Add( group_subpanel, 0,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 5 );
panel->SetSizerAndFit( panel_sizer );
else if( b_old_enabled == VLC_TRUE && !enabled_checkbox->IsChecked() )
p_playlist->i_enabled --;
+ for (int i=0 ; i< p_playlist->i_groups ; i++)
+ {
+ if( !strcasecmp( p_playlist->pp_groups[i]->psz_name,
+ group_combo->GetValue() ))
+ {
+ p_item->i_group = p_playlist->pp_groups[i]->i_id;
+ break;
+ }
+ }
+
vlc_object_release( p_playlist );
}
p_item->b_enabled = enabled_checkbox->IsChecked() ? VLC_TRUE : VLC_FALSE ;
- p_item->i_group = group_spin->GetValue();
EndModal( wxID_OK );
}
EndModal( wxID_CANCEL );
}
-/******************************************************************************
- * Info panel event methods.
- *****************************************************************************/
+void ItemInfoDialog::OnNewGroup( wxCommandEvent& WXUNUSED(event) )
+{
+ NewGroup *p_newgroup = NULL;
+
+ p_newgroup = new NewGroup( p_intf, this );
+
+ if( p_newgroup)
+ {
+ if( p_newgroup->ShowModal() == wxID_OK && p_newgroup->psz_name)
+ {
+ group_combo->Append( wxT( p_newgroup->psz_name));
+ }
+ delete( p_newgroup );
+ }
+}
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: open.cpp,v 1.38 2003/08/22 14:03:40 adn Exp $
+ * $Id: open.cpp,v 1.39 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
int i_access_method, int i_arg ):
wxFrame( _p_parent, -1, wxU(_("Open Target")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
+{
+ OpenDialog( _p_intf, _p_parent, i_access_method, i_arg, OPEN_NORMAL );
+}
+
+OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
+ int i_access_method, int i_arg, int _i_method ):
+ wxFrame( _p_parent, -1, wxU(_("Open Target")), wxDefaultPosition,
+ wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
+ i_method = _i_method;
p_intf = _p_intf;
p_parent = _p_parent;
SetIcon( *p_intf->p_sys->p_icon );
wxU(_("Alternatively, you can build an MRL using one of the "
"following predefined targets:")) );
- /* Create Stream Output checkox */
- wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
- sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
- wxU(_("Stream output")) );
- sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
- sout_sizer->Add( sout_checkbox, 0,
- wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
- sout_button = new wxButton( panel, SoutSettings_Event,
- wxU(_("Settings...")) );
- sout_button->Disable();
-
- char *psz_sout = config_GetPsz( p_intf, "sout" );
- if( psz_sout && *psz_sout )
- {
- sout_checkbox->SetValue(TRUE);
- sout_button->Enable();
- subsfile_mrl.Add( wxString(wxT("sout=")) + wxU(psz_sout) );
- }
- if( psz_sout ) free( psz_sout );
-
- sout_sizer->Add( sout_button, 1, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
-
- /* Create Demux Dump checkox */
- wxBoxSizer *demuxdump_sizer = new wxBoxSizer( wxHORIZONTAL );
- demuxdump_checkbox = new wxCheckBox( panel, DemuxDumpEnable_Event,
- wxU(_("Capture input stream")) );
- demuxdump_checkbox->SetToolTip(
- wxU(_("Capture the stream you are playing to a file")) );
- demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event, wxT(""),
- wxDefaultPosition, wxDefaultSize,
- wxTE_PROCESS_ENTER );
- demuxdump_button = new wxButton( panel, DemuxDumpBrowse_Event,
- wxU(_("Browse...")) );
-
- char *psz_demuxdump = config_GetPsz( p_intf, "demuxdump-file" );
- if( psz_demuxdump && *psz_demuxdump )
+ wxFlexGridSizer *sout_sizer = NULL;
+ wxBoxSizer *demuxdump_sizer = NULL;
+ wxStaticLine *static_line = NULL;
+
+ demuxdump_checkbox = NULL;
+ demuxdump_textctrl = NULL;
+
+ if( i_method == OPEN_NORMAL )
{
- demuxdump_textctrl->SetValue( wxU(psz_demuxdump) );
- }
- if( psz_demuxdump ) free( psz_demuxdump );
+ /* Create Stream Output checkox */
+ sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
- demuxdump_textctrl->Disable();
- demuxdump_button->Disable();
- demuxdump_sizer->Add( demuxdump_checkbox, 0,
- wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
- demuxdump_sizer->Add( demuxdump_button, 0,
- wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 10 );
- demuxdump_sizer->Add( demuxdump_textctrl, 1, wxRIGHT, 10 );
- /* Separation */
- wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
+ sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
+ wxU(_("Stream output")) );
+ sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
+ sout_sizer->Add( sout_checkbox, 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ sout_button = new wxButton( panel, SoutSettings_Event,
+ wxU(_("Settings...")) );
+ sout_button->Disable();
+
+ char *psz_sout = config_GetPsz( p_intf, "sout" );
+ if( psz_sout && *psz_sout )
+ {
+ sout_checkbox->SetValue(TRUE);
+ sout_button->Enable();
+ subsfile_mrl.Add( wxString(wxT("sout=")) + wxU(psz_sout) );
+ }
+ if( psz_sout ) free( psz_sout );
+
+ sout_sizer->Add( sout_button, 1, wxALIGN_LEFT |
+ wxALIGN_CENTER_VERTICAL );
+
+ /* Create Demux Dump checkox */
+ demuxdump_sizer = new wxBoxSizer( wxHORIZONTAL );
+ demuxdump_checkbox = new wxCheckBox( panel, DemuxDumpEnable_Event,
+ wxU(_("Capture input stream")) );
+ demuxdump_checkbox->SetToolTip(
+ wxU(_("Capture the stream you are playing to a file")) );
+ demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event, wxT(""),
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_PROCESS_ENTER );
+ demuxdump_button = new wxButton( panel, DemuxDumpBrowse_Event,
+ wxU(_("Browse...")) );
+
+ char *psz_demuxdump = config_GetPsz( p_intf, "demuxdump-file" );
+ if( psz_demuxdump && *psz_demuxdump )
+ {
+ demuxdump_textctrl->SetValue( wxU(psz_demuxdump) );
+ }
+ if( psz_demuxdump ) free( psz_demuxdump );
+
+ demuxdump_textctrl->Disable();
+ demuxdump_button->Disable();
+ demuxdump_sizer->Add( demuxdump_checkbox, 0,
+ wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
+ demuxdump_sizer->Add( demuxdump_button, 0,
+ wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 10 );
+ demuxdump_sizer->Add( demuxdump_textctrl, 1, wxRIGHT, 10 );
+
+ /* Separation */
+ static_line = new wxStaticLine( panel, wxID_OK );
+ }
/* Create the buttons */
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 );
panel_sizer->Add( label, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( notebook_sizer, 1, wxEXPAND | wxALL, 5 );
- panel_sizer->Add( sout_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
- panel_sizer->Add( demuxdump_sizer, 0, wxEXPAND | wxALIGN_LEFT | wxALL, 5 );
- panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
+ if( i_method == OPEN_NORMAL)
+ {
+ panel_sizer->Add( sout_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
+ panel_sizer->Add( demuxdump_sizer, 0, wxEXPAND | wxALIGN_LEFT
+ | wxALL, 5 );
+ panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
+ }
panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALL, 5 );
panel_sizer->Layout();
panel->SetSizerAndFit( panel_sizer );
i_current_access_method = i_access_method;
/* Check if the user asked for demuxdump */
- if( demuxdump_checkbox->GetValue() )
+ if( demuxdump_checkbox )
{
- demux = wxT("/demuxdump");
+ if( demuxdump_checkbox->GetValue() )
+ {
+ demux = wxT("/demuxdump");
+ }
}
-
switch( i_access_method )
{
case FILE_ACCESS:
if( mrl_combo->GetCount() > 10 ) mrl_combo->Delete( 0 );
mrl_combo->SetSelection( mrl_combo->GetCount() - 1 );
+ if( i_method == OPEN_STREAM )
+ {
+ Hide();
+ return;
+ }
+
/* Update the playlist */
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
void OpenDialog::OnSubsFileEnable( wxCommandEvent& event )
{
subsfile_button->Enable( event.GetInt() != 0 );
- if( event.GetInt() && demuxdump_checkbox->IsChecked() )
+ if( demuxdump_checkbox )
{
- demuxdump_checkbox->SetValue( 0 );
- wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
- event.SetInt( 0 );
- OnDemuxDumpEnable( event );
+ if( event.GetInt() && demuxdump_checkbox->IsChecked() )
+ {
+ demuxdump_checkbox->SetValue( 0 );
+ wxCommandEvent event = wxCommandEvent( wxEVT_NULL );
+ event.SetInt( 0 );
+ OnDemuxDumpEnable( event );
+ }
}
}
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: playlist.cpp,v 1.22 2003/10/06 16:23:30 zorglub Exp $
+ * $Id: playlist.cpp,v 1.23 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
*
/* menu items */
AddFile_Event = 1,
AddMRL_Event,
- Sort_Event,
- RSort_Event,
Close_Event,
Open_Event,
Save_Event,
+ SortTitle_Event,
+ RSortTitle_Event,
+ SortAuthor_Event,
+ RSortAuthor_Event,
+ SortGroup_Event,
+ RSortGroup_Event,
+
EnableSelection_Event,
DisableSelection_Event,
Repeat_Event,
SelectAll_Event,
- En_Dis_Event,
+ EnableGroup_Event,
+ DisableGroup_Event,
+ Up_Event,
+ Down_Event,
Infos_Event,
SearchText_Event,
/* Menu events */
EVT_MENU(AddFile_Event, Playlist::OnAddFile)
EVT_MENU(AddMRL_Event, Playlist::OnAddMRL)
- EVT_MENU(Sort_Event, Playlist::OnSort)
- EVT_MENU(RSort_Event, Playlist::OnRSort)
EVT_MENU(Close_Event, Playlist::OnClose)
EVT_MENU(Open_Event, Playlist::OnOpen)
EVT_MENU(Save_Event, Playlist::OnSave)
+
+ EVT_MENU(SortTitle_Event, Playlist::OnSort)
+ EVT_MENU(RSortTitle_Event, Playlist::OnSort)
+ EVT_MENU(SortAuthor_Event, Playlist::OnSort)
+ EVT_MENU(RSortAuthor_Event, Playlist::OnSort)
+ EVT_MENU(SortGroup_Event, Playlist::OnSort)
+ EVT_MENU(RSortGroup_Event, Playlist::OnSort)
+
EVT_MENU(EnableSelection_Event, Playlist::OnEnableSelection)
EVT_MENU(DisableSelection_Event, Playlist::OnDisableSelection)
EVT_MENU(InvertSelection_Event, Playlist::OnInvertSelection)
EVT_CHECKBOX(Repeat_Event, Playlist::OnRepeat)
EVT_CHECKBOX(Loop_Event, Playlist::OnLoop)
+ EVT_MENU(EnableGroup_Event, Playlist::OnEnDis)
+ EVT_MENU(DisableGroup_Event, Playlist::OnEnDis)
+
/* Listview events */
EVT_LIST_ITEM_ACTIVATED(ListView_Event, Playlist::OnActivateItem)
EVT_LIST_KEY_DOWN(ListView_Event, Playlist::OnKeyDown)
/* Button events */
EVT_BUTTON( Search_Event, Playlist::OnSearch)
- EVT_BUTTON( En_Dis_Event, Playlist::OnEnDis)
EVT_BUTTON( Save_Event, Playlist::OnSave)
EVT_BUTTON( Infos_Event, Playlist::OnInfos)
+ EVT_BUTTON( Up_Event, Playlist::OnUp)
+ EVT_BUTTON( Down_Event, Playlist::OnDown)
+
EVT_TEXT(SearchText_Event, Playlist::OnSearchTextChange)
/* Special events : we don't want to destroy the window when the user
EVT_CLOSE(Playlist::OnClose)
END_EVENT_TABLE()
+
+/* Event Table for the Newgroup class */
+BEGIN_EVENT_TABLE(NewGroup, wxDialog)
+ EVT_BUTTON( wxID_OK, NewGroup::OnOk)
+ EVT_BUTTON( wxID_CANCEL, NewGroup::OnCancel)
+END_EVENT_TABLE()
+
/*****************************************************************************
* Constructor.
*****************************************************************************/
p_intf = _p_intf;
vlc_value_t val;
i_update_counter = 0;
+ i_sort_mode = MODE_NONE;
b_need_update = VLC_FALSE;
vlc_mutex_init( p_intf, &lock );
SetIcon( *p_intf->p_sys->p_icon );
wxMenu *manage_menu = new wxMenu;
manage_menu->Append( AddFile_Event, wxU(_("&Simple Add...")) );
manage_menu->Append( AddMRL_Event, wxU(_("&Add MRL...")) );
- manage_menu->Append( Sort_Event, wxU(_("&Sort")) );
- manage_menu->Append( RSort_Event, wxU(_("&Reverse Sort")) );
+ manage_menu->AppendSeparator();
manage_menu->Append( Open_Event, wxU(_("&Open Playlist...")) );
manage_menu->Append( Save_Event, wxU(_("&Save Playlist...")) );
manage_menu->AppendSeparator();
manage_menu->Append( Close_Event, wxU(_("&Close")) );
+ /* Create our "Sort" menu */
+ wxMenu *sort_menu = new wxMenu;
+ sort_menu->Append( SortTitle_Event, wxU(_("&Sort by title")) );
+ sort_menu->Append( RSortTitle_Event, wxU(_("&Reverse sort by title")) );
+ sort_menu->AppendSeparator();
+ sort_menu->Append( SortAuthor_Event, wxU(_("&Sort by author")) );
+ sort_menu->Append( RSortAuthor_Event, wxU(_("&Reverse sort by author")) );
+ sort_menu->AppendSeparator();
+ sort_menu->Append( SortGroup_Event, wxU(_("&Sort by group")) );
+ sort_menu->Append( RSortGroup_Event, wxU(_("&Reverse sort by group")) );
+
/* Create our "Selection" menu */
wxMenu *selection_menu = new wxMenu;
selection_menu->Append( EnableSelection_Event, wxU(_("&Enable")) );
selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) );
selection_menu->Append( SelectAll_Event, wxU(_("&Select All")) );
+ /* Create our "Group" menu */
+ wxMenu *group_menu = new wxMenu;
+ group_menu->Append( EnableGroup_Event, wxU(_("&Enable all group items")) );
+ group_menu->Append( DisableGroup_Event,
+ wxU(_("&Disable all group items")) );
+
/* Append the freshly created menus to the menu bar */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
menubar->Append( manage_menu, wxU(_("&Manage")) );
+ menubar->Append( sort_menu, wxU(_("S&ort")) );
menubar->Append( selection_menu, wxU(_("&Selection")) );
+ menubar->Append( group_menu, wxU(_("&Groups")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
+
/* Create a panel to put everything in */
wxPanel *playlist_panel = new wxPanel( this, -1 );
playlist_panel->SetAutoLayout( TRUE );
- /* Create the listview */
- /* FIXME: the given size is arbitrary, and prevents us from resizing
- * the window to smaller dimensions. But the sizers don't seem to adjust
- * themselves to the size of a listview, and with a wxDefaultSize the
- * playlist window is ridiculously small */
- listview = new wxListView( playlist_panel, ListView_Event,
- wxDefaultPosition, wxSize( 305, 300 ),
- wxLC_REPORT | wxSUNKEN_BORDER );
- listview->InsertColumn( 0, wxU(_("Url")) );
- #if 0
- listview->InsertColumn( 1, wxU(_("Duration")) );
- #endif
- listview->SetColumnWidth( 0, 300 );
- #if 0
- listview->SetColumnWidth( 1, 100 );
- #endif
-
/* Create the Random checkbox */
wxCheckBox *random_checkbox =
new wxCheckBox( playlist_panel, Random_Event, wxU(_("Random")) );
-
var_Get( p_intf, "random", &val);
vlc_bool_t b_random = val.b_bool;
random_checkbox->SetValue( b_random == VLC_FALSE ? 0 : 1);
/* Create the Loop Checkbox */
wxCheckBox *loop_checkbox =
new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) );
-
var_Get( p_intf, "loop", &val );
int b_loop = val.b_bool ;
loop_checkbox->SetValue( b_loop );
/* Create the Repeat one checkbox */
wxCheckBox *repeat_checkbox =
new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat one")) );
-
var_Get( p_intf, "repeat", &val );
int b_repeat = val.b_bool ;
repeat_checkbox->SetValue( b_repeat );
search_button =
new wxButton( playlist_panel, Search_Event, wxU(_("Search")) );
- wxButton *en_dis_button =
- new wxButton( playlist_panel, En_Dis_Event, wxU(_("Enable/Disable Group") ) );
+ /* Create the listview */
+ /* FIXME: the given size is arbitrary, and prevents us from resizing
+ * the window to smaller dimensions. But the sizers don't seem to adjust
+ * themselves to the size of a listview, and with a wxDefaultSize the
+ * playlist window is ridiculously small */
+ listview = new wxListView( playlist_panel, ListView_Event,
+ wxDefaultPosition, wxSize( 500, 300 ),
+ wxLC_REPORT | wxSUNKEN_BORDER );
+ listview->InsertColumn( 0, wxU(_("Name")) );
+ #if 0
+ listview->InsertColumn( 1, wxU(_("Duration")) );
+ #endif
+ listview->InsertColumn( 1, wxU(_("Author")) );
+ listview->InsertColumn( 2, wxU(_("Group")) );
+ listview->SetColumnWidth( 0, 270 );
+ listview->SetColumnWidth( 1, 150 );
+ listview->SetColumnWidth( 2, 80 );
+
+ /* Create the Up-Down buttons */
+ wxButton *up_button =
+ new wxButton( playlist_panel, Up_Event, wxU(_("Up") ) );
+
+ wxButton *down_button =
+ new wxButton( playlist_panel, Down_Event, wxU(_("Down") ) );
+
+ /* Create the iteminfo button */
wxButton *iteminfo_button =
new wxButton( playlist_panel, Infos_Event, wxU(_("Item Infos") ) );
+
/* Place everything in sizers */
wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
- button_sizer->Add( en_dis_button, 0, wxALIGN_CENTER|wxRIGHT, 5);
button_sizer->Add( iteminfo_button, 0, wxALIGN_CENTER|wxLEFT , 5);
button_sizer->Layout();
+ wxBoxSizer *updown_sizer = new wxBoxSizer( wxHORIZONTAL );
+ updown_sizer->Add( up_button, 0, wxALIGN_LEFT|wxRIGHT, 3);
+ updown_sizer->Add( down_button, 0, wxALIGN_LEFT|wxLEFT, 3);
+ updown_sizer->Layout();
wxBoxSizer *checkbox_sizer = new wxBoxSizer( wxHORIZONTAL );
checkbox_sizer->Add( random_checkbox, 0,
wxEXPAND|wxALIGN_RIGHT, 5);
checkbox_sizer->Add( repeat_checkbox, 0,
wxEXPAND|wxALIGN_RIGHT, 5);
-
checkbox_sizer->Layout();
wxBoxSizer *search_sizer = new wxBoxSizer( wxHORIZONTAL );
- search_sizer->Add( search_text, 0, wxALL|wxALIGN_CENTER, 5);
- search_sizer->Add( search_button, 0, wxALL|wxALIGN_CENTER, 5);
-
+ search_sizer->Add( search_text, 0, wxRIGHT|wxALIGN_CENTER, 3);
+ search_sizer->Add( search_button, 0, wxLEFT|wxALIGN_CENTER, 3);
search_sizer->Layout();
- wxBoxSizer *bottom_sizer = new wxBoxSizer( wxVERTICAL );
- bottom_sizer->Add( checkbox_sizer, 0, wxALL|wxALIGN_CENTER, 5 );
- bottom_sizer->Add( button_sizer , 0, wxALL|wxALIGN_CENTER, 5 );
+ /* The top and bottom sizers */
+ wxBoxSizer *top_sizer = new wxBoxSizer( wxHORIZONTAL );
+ top_sizer->Add( checkbox_sizer, 0, wxLEFT|wxRIGHT|wxALIGN_LEFT, 4 );
+ top_sizer->Add( search_sizer, 0, wxLEFT|wxRIGHT|wxALIGN_RIGHT, 4 );
+ top_sizer->Layout();
+ wxBoxSizer *bottom_sizer = new wxBoxSizer( wxHORIZONTAL );
+ bottom_sizer->Add( updown_sizer, 0, wxEXPAND |wxRIGHT | wxLEFT | wxALIGN_LEFT, 4);
+ bottom_sizer->Add( button_sizer , 0, wxEXPAND|wxLEFT | wxRIGHT | wxALIGN_RIGHT, 4 );
bottom_sizer->Layout();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
+ panel_sizer->Add( top_sizer, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( listview, 1, wxEXPAND | wxALL, 5 );
-
- panel_sizer->Add( search_sizer, 0, wxALIGN_CENTRE );
- panel_sizer->Add( bottom_sizer, 0 , wxALIGN_CENTRE);
+ panel_sizer->Add( bottom_sizer, 0 , wxEXPAND | wxALL, 5);
panel_sizer->Layout();
playlist_panel->SetSizerAndFit( panel_sizer );
return;
}
- /* We want to be noticed of playlit changes */
+ /* We want to be noticed of playlist changes */
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
vlc_object_release( p_playlist );
vlc_object_release( p_playlist );
}
+/**********************************************************************
+ * Rebuild the playlist
+ **********************************************************************/
void Playlist::Rebuild()
{
playlist_t *p_playlist =
return;
}
+ int i_focused = listview->GetFocusedItem();
+
/* Clear the list... */
listview->DeleteAllItems();
{
wxString filename = wxU(p_playlist->pp_items[i]->psz_name);
listview->InsertItem( i, filename );
+ listview->SetItem( i, 1, wxU(p_playlist->pp_items[i]->psz_author));
+ listview->SetItem( i, 2,
+ wxU(playlist_FindGroup(p_playlist,p_playlist->
+ pp_items[i]->i_group)));
if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
{
wxListItem listitem;
listitem.SetTextColour( *wxRED );
listview->SetItem( listitem );
- listview->Focus( p_playlist->i_index );
+ if( i_focused )
+ {
+ listview->Focus( i_focused );
+ listview->Select( i_focused );
+ }
+ else
+ {
+ listview->Focus( p_playlist->i_index );
+ }
vlc_object_release( p_playlist );
}
vlc_mutex_lock( &lock );
if( this->b_need_update )
{
- b_need_update = VLC_TRUE;
+ b_need_update =VLC_TRUE;
this->b_need_update = VLC_FALSE;
}
vlc_mutex_unlock( &lock );
- if( b_need_update ) Rebuild();
+ if( b_need_update )
+ {
+ Rebuild();
+ }
/* Updating the playing status every 0.5s is enough */
if( i_update_counter % 5 ) return;
}
/* Update the colour of items */
+
vlc_mutex_lock( &p_playlist->object_lock );
if( p_intf->p_sys->i_playing != p_playlist->i_index )
{
p_intf->p_sys->i_playing = p_playlist->i_index;
}
vlc_mutex_unlock( &p_playlist->object_lock );
-
vlc_object_release( p_playlist );
}
#endif
}
-void Playlist::OnSort( wxCommandEvent& WXUNUSED(event) )
+/********************************************************************
+ * Move functions
+ ********************************************************************/
+void Playlist::OnUp( wxCommandEvent& event)
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
return;
}
- playlist_Sort( p_playlist , 0 );
-
+ /* We use the first selected item, so find it */
+ long i_item = -1;
+ i_item = listview->GetNextItem(i_item,
+ wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
+ if( i_item > 0 && i_item < p_playlist->i_size )
+ {
+ playlist_Move( p_playlist , i_item, i_item - 1);
+ if( i_item > 1 )
+ {
+ listview->Focus( i_item - 1 );
+ }
+ else
+ {
+ listview->Focus(0);
+ }
+ }
vlc_object_release( p_playlist );
-
- Rebuild();
-
return;
}
-void Playlist::OnRSort( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnDown( wxCommandEvent& event)
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
return;
}
- playlist_Sort( p_playlist , 1 );
+ /* We use the first selected item, so find it */
+ long i_item = -1;
+ i_item = listview->GetNextItem(i_item,
+ wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
+ if( i_item >= 0 && i_item < p_playlist->i_size - 1 )
+ {
+ playlist_Move( p_playlist , i_item, i_item + 2 );
+ listview->Focus( i_item + 1 );
+ }
+ vlc_object_release( p_playlist );
+ return;
+}
+/********************************************************************
+ * Sorting functions
+ ********************************************************************/
+void Playlist::OnSort( wxCommandEvent& event )
+{
+ playlist_t *p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ {
+ return;
+ }
+ switch( event.GetId() )
+ {
+ case SortTitle_Event:
+ playlist_SortTitle( p_playlist , 0 );
+ break;
+ case RSortTitle_Event:
+ playlist_SortTitle( p_playlist , 1 );
+ break;
+ case SortAuthor_Event:
+ playlist_SortAuthor(p_playlist , 0 );
+ break;
+ case RSortAuthor_Event:
+ playlist_SortAuthor( p_playlist , 1 );
+ break;
+ case SortGroup_Event:
+ playlist_SortGroup( p_playlist , 0 );
+ break;
+ case RSortGroup_Event:
+ playlist_SortGroup( p_playlist , 1 );
+ break;
+ }
vlc_object_release( p_playlist );
Rebuild();
return;
}
+/**********************************************************************
+ * Search functions
+ **********************************************************************/
void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
{
search_button->SetDefault();
int i_first = 0 ;
int i_item = -1;
- for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ )
+ for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ )
{
if( listview->GetItemState( i_current, wxLIST_STATE_SELECTED)
== wxLIST_STATE_SELECTED )
}
}
- for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ;
+ for ( i_current = i_first + 1; i_current <= listview->GetItemCount() ;
i_current++ )
{
wxListItem listitem;
{
listview->Select( item, FALSE );
}
-
+
wxListItem listitem;
listitem.SetId(i_item);
listitem.m_state = wxLIST_STATE_SELECTED;
}
+/**********************************************************************
+ * Selection functions
+ **********************************************************************/
void Playlist::OnInvertSelection( wxCommandEvent& WXUNUSED(event) )
{
for( long item = 0; item < listview->GetItemCount(); item++ )
Rebuild();
}
+void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
+{
+ for( long item = 0; item < listview->GetItemCount(); item++ )
+ {
+ listview->Select( item, TRUE );
+ }
+}
+
+/**********************************************************************
+ * Playlist mode functions
+ **********************************************************************/
void Playlist::OnRandom( wxCommandEvent& event )
{
vlc_value_t val;
vlc_object_release( p_playlist );
}
-void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
-{
- for( long item = 0; item < listview->GetItemCount(); item++ )
- {
- listview->Select( item, TRUE );
- }
-}
+
void Playlist::OnActivateItem( wxListEvent& event )
{
vlc_object_release( p_playlist );
}
-
-void Playlist::OnEnDis( wxCommandEvent& WXUNUSED(event) )
+void Playlist::OnEnDis( wxCommandEvent& event )
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
if( i_item >= 0 && i_item < p_playlist->i_size )
{
- if( p_playlist->pp_items[i_item]->b_enabled == VLC_TRUE)
- playlist_DisableGroup( p_playlist ,
+ switch( event.GetId() )
+ {
+ case EnableGroup_Event:
+ playlist_EnableGroup( p_playlist ,
p_playlist->pp_items[i_item]->i_group );
- else
- playlist_EnableGroup( p_playlist ,
+ break;
+ case DisableGroup_Event:
+ playlist_DisableGroup( p_playlist ,
p_playlist->pp_items[i_item]->i_group );
+ break;
+ }
Rebuild();
}
vlc_object_release( p_playlist );
}
+
/*****************************************************************************
* PlaylistChanged: callback triggered by the intf-change playlist variable
* We don't rebuild the playlist directly here because we don't want the
vlc_mutex_unlock( &p_playlist_dialog->lock );
return VLC_SUCCESS;
}
+
+
+/***************************************************************************
+ * NewGroup
+ ***************************************************************************/
+NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ):
+ wxDialog( _p_parent, -1, wxU(_("New Group")), wxDefaultPosition,
+ wxDefaultSize, wxDEFAULT_FRAME_STYLE )
+{
+ /* Initializations */
+ p_intf = _p_intf;
+ psz_name = NULL;
+ SetIcon( *p_intf->p_sys->p_icon );
+
+ /* Create a panel to put everything in*/
+ wxPanel *panel = new wxPanel( this, -1 );
+ panel->SetAutoLayout( TRUE );
+
+ wxStaticText *group_label =
+ new wxStaticText( panel , -1,
+ wxU(_("Enter the name for the new group")));
+
+ groupname = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition,
+ wxSize(80,27),wxTE_PROCESS_ENTER);
+
+ wxButton *ok_button = new wxButton(panel, wxID_OK, wxU(_("OK")) );
+ ok_button->SetDefault();
+ wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
+ wxU(_("Cancel")) );
+
+ wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+ button_sizer->Add( ok_button, 0, wxALL, 5 );
+ button_sizer->Add( cancel_button, 0, wxALL, 5 );
+ button_sizer->Layout();
+
+ wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
+ panel_sizer->Add( group_label, 0, wxEXPAND | wxALL, 5 );
+ panel_sizer->Add( groupname, 0, wxEXPAND | wxALL, 5 );
+ panel_sizer->Add( button_sizer, 0, wxEXPAND | wxALL, 5 );
+ panel_sizer->Layout();
+
+ panel->SetSizerAndFit( panel_sizer );
+
+ wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
+ main_sizer->Add( panel, 1, wxEXPAND, 0 );
+ main_sizer->Layout();
+ SetSizerAndFit( main_sizer );
+}
+
+NewGroup::~NewGroup()
+{
+}
+
+void NewGroup::OnOk( wxCommandEvent& event )
+{
+ psz_name = strdup( groupname->GetLineText(0).mb_str() );
+
+ playlist_t * p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist )
+ {
+ if( !playlist_CreateGroup( p_playlist, psz_name ) )
+ {
+ psz_name = NULL;
+ }
+ }
+
+ vlc_object_release( p_playlist );
+ EndModal( wxID_OK );
+}
+
+void NewGroup::OnCancel( wxCommandEvent& WXUNUSED(event) )
+{
+ EndModal( wxID_CANCEL );
+}
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: preferences.cpp,v 1.39 2003/10/29 01:33:27 gbazin Exp $
+ * $Id: preferences.cpp,v 1.40 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*****************************************************************************/
PrefsDialog::PrefsDialog( intf_thread_t *_p_intf, wxWindow *p_parent)
: wxFrame( p_parent, -1, wxU(_("Preferences")), wxDefaultPosition,
- wxSize(700,450), wxDEFAULT_FRAME_STYLE )
+ wxSize(830,450), wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
p_intf = _p_intf;
return i_type == 1 ? AUDIO_FILTER_TITLE : AUDIO_FILTER_HELP;
if( !strcasecmp(psz_capability,"audio output") )
return i_type == 1 ? AOUT_TITLE : AOUT_HELP;
+ if( !strcasecmp(psz_capability,"audio encoder") )
+ return i_type == 1 ? AOUT_ENC_TITLE : AOUT_ENC_HELP;
if( !strcasecmp(psz_capability,"chroma") )
return i_type == 1 ? CHROMA_TITLE : CHROMA_HELP;
if( !strcasecmp(psz_capability,"decoder") )
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.65 2003/10/14 22:41:41 gbazin Exp $
+ * $Id: wxwindows.h,v 1.66 2003/10/29 17:32:54 zorglub Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#define WRAPCOUNT 80
+#define OPEN_NORMAL 0
+#define OPEN_STREAM 1
+
+#define MODE_NONE 0
+#define MODE_GROUP 1
+#define MODE_AUTHOR 2
+#define MODE_TITLE 3
+
wxArrayString SeparateEntries( wxString );
/*****************************************************************************
void OnOpenNet( wxCommandEvent& event );
void OnOpenSat( wxCommandEvent& event );
void OnOpenV4L( wxCommandEvent& event );
+ void OnStream( wxCommandEvent& event );
void OnExtra( wxCommandEvent& event );
void OnShowDialog( wxCommandEvent& event );
void OnPlayStream( wxCommandEvent& event );
void OnSaturationUpdate( wxScrollEvent& event );
void OnRatio( wxCommandEvent& event );
+ void OnEnableVisual( wxCommandEvent& event );
void OnMenuOpen( wxMenuEvent& event );
vlc_bool_t b_misc_menu;
};
+class StreamDialog;
+
/* Dialogs Provider */
class DialogsProvider: public wxFrame
{
void OnMessages( wxCommandEvent& event );
void OnFileInfo( wxCommandEvent& event );
void OnPreferences( wxCommandEvent& event );
+ void OnStreamDialog( wxCommandEvent& event );
void OnOpenFileGeneric( wxCommandEvent& event );
void OnOpenFileSimple( wxCommandEvent& event );
Playlist *p_playlist_dialog;
Messages *p_messages_dialog;
FileInfo *p_fileinfo_dialog;
+ StreamDialog *p_stream_dialog;
wxFrame *p_prefs_dialog;
wxFileDialog *p_file_generic_dialog;
};
public:
/* Constructor */
OpenDialog( intf_thread_t *p_intf, wxWindow *p_parent,
- int i_access_method, int i_arg = 0 );
+ int i_access_method, int i_arg = 0 );
+
+ /* Extended Contructor */
+ OpenDialog( intf_thread_t *p_intf, wxWindow *p_parent,
+ int i_access_method, int i_arg = 0 , int _i_method = 0 );
virtual ~OpenDialog();
int Show();
wxWindow *p_parent;
int i_current_access_method;
+ int i_method; /* Normal or for the stream dialog ? */
wxComboBox *mrl_combo;
wxNotebook *notebook;
wxWindow *p_parent;
};
+/* Stream */
+class StreamDialog: public wxFrame
+{
+public:
+ /* Constructor */
+ StreamDialog( intf_thread_t *p_intf, wxWindow *p_parent );
+ virtual ~StreamDialog();
+
+private:
+ void OnClose( wxCommandEvent& event );
+ void OnOpen( wxCommandEvent& event );
+ void OnSout( wxCommandEvent& event );
+ void OnStart( wxCommandEvent& event );
+
+ DECLARE_EVENT_TABLE();
+
+ intf_thread_t *p_intf;
+
+ wxStaticText *step2_label;
+ wxStaticText *step3_label;
+ wxButton *sout_button;
+ wxButton *start_button;
+ wxArrayString mrl;
+ wxArrayString sout_mrl;
+ OpenDialog *p_open_dialog;
+ SoutDialog *p_sout_dialog;
+};
+
+
+
/* Preferences Dialog */
class PrefsTreeCtrl;
class PrefsDialog: public wxFrame
/* Playlist */
class ItemInfoDialog;
+class NewGroup;
class Playlist: public wxFrame
{
public:
/* Event handlers (these functions should _not_ be virtual) */
void OnAddFile( wxCommandEvent& event );
void OnAddMRL( wxCommandEvent& event );
- void OnSort( wxCommandEvent& event );
- void OnRSort( wxCommandEvent& event );
void OnClose( wxCommandEvent& event );
void OnSearch( wxCommandEvent& event );
void OnEnDis( wxCommandEvent& event );
void OnSearchTextChange( wxCommandEvent& event );
void OnOpen( wxCommandEvent& event );
void OnSave( wxCommandEvent& event );
+
+ void OnSort( wxCommandEvent& event );
+
+ void OnUp( wxCommandEvent& event);
+ void OnDown( wxCommandEvent& event);
+
void OnEnableSelection( wxCommandEvent& event );
void OnDisableSelection( wxCommandEvent& event );
void OnInvertSelection( wxCommandEvent& event );
void OnLoop ( wxCommandEvent& event );
void OnActivateItem( wxListEvent& event );
void OnKeyDown( wxListEvent& event );
+ void OnNewGroup( wxCommandEvent& event );
+
void Rebuild();
wxTextCtrl *search_text;
intf_thread_t *p_intf;
wxListView *listview;
+ wxTreeCtrl *treeview;
int i_update_counter;
+ int i_sort_mode;
+};
+
+
+class NewGroup: public wxDialog
+{
+public:
+ /* Constructor */
+ NewGroup( intf_thread_t *p_intf, wxWindow *p_parent );
+ virtual ~NewGroup();
+
+private:
+
+ /* Event handlers (these functions should _not_ be virtual) */
+ void OnOk( wxCommandEvent& event );
+ void OnCancel( wxCommandEvent& event );
+
+ DECLARE_EVENT_TABLE();
+
+ intf_thread_t *p_intf;
+ wxTextCtrl *groupname;
+
+protected:
+ friend class Playlist;
+ friend class ItemInfoDialog;
+ char *psz_name;
};
/* Event handlers (these functions should _not_ be virtual) */
void OnOk( wxCommandEvent& event );
void OnCancel( wxCommandEvent& event );
+ void OnNewGroup( wxCommandEvent& event );
DECLARE_EVENT_TABLE();
wxTextCtrl *author_text;
wxCheckBox *enabled_checkbox;
- wxSpinCtrl *group_spin;
+ wxComboBox *group_combo;
+ int ids_array[100];
};
};
+
#if !defined(__WXX11__)
/* Drag and Drop class */
class DragAndDrop: public wxFileDropTarget
* sap.c : SAP interface module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.27 2003/10/13 05:48:08 zorglub Exp $
+ * $Id: sap.c,v 1.28 2003/10/29 17:32:55 zorglub Exp $
*
* Authors: Arnaud Schauly <gitan@via.ecp.fr>
* Clément Stenac <zorglub@via.ecp.fr>
/* Detect multicast addresses */
static int ismult( char * );
+/* Our custom structure */
+struct intf_sys_t
+{
+ int i_group;
+};
+
/* The struct that contains sdp informations */
struct sess_descr_t
{
#define SAP_IPV6_LONGTEXT N_("Set this if you want SAP to listen for IPv6 announces")
#define SAP_SCOPE_TEXT N_("IPv6 SAP scope")
#define SAP_SCOPE_LONGTEXT N_("Sets the scope for IPv6 announces (default is 8)")
-#define SAP_GROUP_ID_TEXT N_("SAP Playlist group ID")
-#define SAP_GROUP_ID_LONGTEXT N_("Sets the default group ID in which" \
- "SAP items are put" )
vlc_module_begin();
add_category_hint( N_("SAP"), NULL, VLC_TRUE );
add_string( "sap-ipv6-scope", "8" , NULL,
SAP_SCOPE_TEXT, SAP_SCOPE_LONGTEXT, VLC_TRUE);
- add_integer( "sap-group-id", 42, NULL,
- SAP_GROUP_ID_TEXT, SAP_GROUP_ID_LONGTEXT, VLC_TRUE);
-
set_description( _("SAP interface") );
set_capability( "interface", 0 );
set_callbacks( Activate, NULL);
module_t *p_network;
network_socket_t socket_desc;
+ playlist_t *p_playlist;
+ playlist_group_t *p_group;
if( sap_ipv4 == -1 || sap_ipv6 == -1 || sap_ipv6_scope == NULL )
{
return;
}
+
+ p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( !p_intf->p_sys )
+ {
+ msg_Err( p_intf, "Out of memory !");
+ return VLC_EGENERIC;
+ }
+ /* Create our playlist group */
+ p_playlist =
+ (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ p_group = playlist_CreateGroup( p_playlist , "SAP" );
+ p_intf->p_sys->i_group = p_group->i_id;
+
+ vlc_object_release( p_playlist );
+
/* Prepare IPv4 Networking */
if ( sap_ipv4 == 1)
{
if( p_item )
{
- p_item->i_group = config_GetInt( p_intf, "sap-group-id" );
+ p_item->i_group = p_intf->p_sys->i_group;
p_item->b_enabled = VLC_TRUE;
p_item->psz_author = NULL;
p_playlist = vlc_object_find( p_intf,
*psz_eof = '\0';
sd->pp_attributes[sd->i_attributes]->psz_field =
strdup( p_packet );
- sd->pp_attributes[sd->i_attributes]->psz_value =
+ if( psz_eof + 1 )
+ {
+ sd->pp_attributes[sd->i_attributes]->psz_value =
strdup( ++psz_eof );
+ }
+ else
+ {
+ if( sd->pp_attributes[sd->i_attributes]->psz_field )
+ free( sd->pp_attributes[sd->i_attributes]
+ ->psz_field );
+ break;
+ }
for( i=0 ; i<
strlen(sd->pp_attributes[sd->i_attributes]->psz_value) ;
i++ )
* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.61 2003/10/20 22:28:26 gbazin Exp $
+ * $Id: playlist.c,v 1.62 2003/10/29 17:32:55 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
p_playlist->i_size = 0;
p_playlist->pp_items = NULL;
+ p_playlist->i_groups = 0;
+ p_playlist->pp_groups = NULL;
+ p_playlist->i_max_id = 0;
+
+ playlist_CreateGroup( p_playlist, strdup("Normal") );
+
+ msg_Dbg(p_playlist,"pouet");
if( vlc_thread_create( p_playlist, "playlist", RunThread,
VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
{
return NULL;
}
+ msg_Dbg(p_playlist,"pouet2");
/* The object has been initialized, now attach it */
vlc_object_attach( p_playlist, p_parent );
vlc_object_destroy( p_playlist );
}
-/**
- * Add an MRL to the playlist. This is a simplified version of
- * playlist_AddExt inculded for convenince. It equals calling playlist_AddExt
- * with psz_name == psz_target and i_duration == -1
- */
-
-int playlist_Add( playlist_t *p_playlist, const char *psz_target,
- const char **ppsz_options, int i_options,
- int i_mode, int i_pos )
-{
- return playlist_AddExt( p_playlist, psz_target, psz_target, -1,
- ppsz_options, i_options, i_mode, i_pos );
-}
-
-/**
- * Add a MRL into the playlist.
- *
- * \param p_playlist the playlist to add into
- * \param psz_uri the mrl to add to the playlist
- * \param psz_name a text giving a name or description of this item
- * \param i_duration a hint about the duration of this item, in miliseconds, or
- * -1 if unknown.
- * \param ppsz_options array of options
- * \param i_options number of items in ppsz_options
- * \param i_mode the mode used when adding
- * \param i_pos the position in the playlist where to add. If this is
- * PLAYLIST_END the item will be added at the end of the playlist
- * regardless of it's size
- * \return always returns 0
-*/
-int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
- const char * psz_name, mtime_t i_duration,
- const char **ppsz_options, int i_options, int i_mode,
- int i_pos )
-{
- playlist_item_t * p_item;
-
- p_item = malloc( sizeof( playlist_item_t ) );
- if( p_item == NULL )
- {
- msg_Err( p_playlist, "out of memory" );
- }
-
- p_item->psz_name = strdup( psz_name );
- p_item->psz_uri = strdup( psz_uri );
- p_item->psz_author = strdup( "" );
- p_item->i_duration = i_duration;
- p_item->i_type = 0;
- p_item->i_status = 0;
- p_item->b_autodeletion = VLC_FALSE;
- p_item->b_enabled = VLC_TRUE;
- p_item->i_group = PLAYLIST_TYPE_MANUAL;
-
- p_item->ppsz_options = NULL;
- p_item->i_options = i_options;
-
- if( i_options )
- {
- int i;
-
- p_item->ppsz_options = (char **)malloc( i_options * sizeof(char *) );
- for( i = 0; i < i_options; i++ )
- p_item->ppsz_options[i] = strdup( ppsz_options[i] );
-
- }
-
- return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
-}
-
-/**
- * Add a playlist item into a playlist
- *
- * \param p_playlist the playlist to insert into
- * \param p_item the playlist item to insert
- * \param i_mode the mode used when adding
- * \param i_pos the possition in the playlist where to add. If this is
- * PLAYLIST_END the item will be added at the end of the playlist
- * regardless of it's size
- * \return always returns 0
-*/
-int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
- int i_mode, int i_pos)
-{
- vlc_value_t val;
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
- /*
- * CHECK_INSERT : checks if the item is already enqued before
- * enqueing it
- */
- if ( i_mode & PLAYLIST_CHECK_INSERT )
- {
- int j;
-
- if ( p_playlist->pp_items )
- {
- for ( j = 0; j < p_playlist->i_size; j++ )
- {
- if ( !strcmp( p_playlist->pp_items[j]->psz_uri, p_item->psz_uri ) )
- {
- if( p_item->psz_name )
- {
- free( p_item->psz_name );
- }
- if( p_item->psz_uri )
- {
- free( p_item->psz_uri );
- }
- free( p_item );
- vlc_mutex_unlock( &p_playlist->object_lock );
- return 0;
- }
- }
- }
- i_mode &= ~PLAYLIST_CHECK_INSERT;
- i_mode |= PLAYLIST_APPEND;
- }
-
-
- msg_Dbg( p_playlist, "adding playlist item « %s » ( %s )", p_item->psz_name, p_item->psz_uri);
-
- /* Create the new playlist item */
-
-
- /* Do a few boundary checks and allocate space for the item */
- if( i_pos == PLAYLIST_END )
- {
- if( i_mode & PLAYLIST_INSERT )
- {
- i_mode &= ~PLAYLIST_INSERT;
- i_mode |= PLAYLIST_APPEND;
- }
-
- i_pos = p_playlist->i_size - 1;
- }
-
- if( !(i_mode & PLAYLIST_REPLACE)
- || i_pos < 0 || i_pos >= p_playlist->i_size )
- {
- /* Additional boundary checks */
- if( i_mode & PLAYLIST_APPEND )
- {
- i_pos++;
- }
-
- if( i_pos < 0 )
- {
- i_pos = 0;
- }
- else if( i_pos > p_playlist->i_size )
- {
- i_pos = p_playlist->i_size;
- }
-
- INSERT_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos,
- p_item );
- p_playlist->i_enabled ++;
-
- if( p_playlist->i_index >= i_pos )
- {
- p_playlist->i_index++;
- }
- }
- else
- {
- /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
- if( p_playlist->pp_items[i_pos]->psz_name )
- {
- free( p_playlist->pp_items[i_pos]->psz_name );
- }
- if( p_playlist->pp_items[i_pos]->psz_uri )
- {
- free( p_playlist->pp_items[i_pos]->psz_uri );
- }
- /* XXX: what if the item is still in use? */
- free( p_playlist->pp_items[i_pos] );
- p_playlist->pp_items[i_pos] = p_item;
- }
-
- if( i_mode & PLAYLIST_GO )
- {
- p_playlist->i_index = i_pos;
- if( p_playlist->p_input )
- {
- input_StopThread( p_playlist->p_input );
- }
- p_playlist->i_status = PLAYLIST_RUNNING;
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * delete an item from a playlist.
- *
- * \param p_playlist the playlist to remove from.
- * \param i_pos the position of the item to remove
- * \return returns 0
- */
-int playlist_Delete( playlist_t * p_playlist, int i_pos )
-{
- vlc_value_t val;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
- {
- msg_Dbg( p_playlist, "deleting playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( p_playlist->pp_items[i_pos]->psz_name )
- {
- free( p_playlist->pp_items[i_pos]->psz_name );
- }
- if( p_playlist->pp_items[i_pos]->psz_uri )
- {
- free( p_playlist->pp_items[i_pos]->psz_uri );
- }
- if( p_playlist->pp_items[i_pos]->i_options )
- {
- int i;
-
- for( i = 0; i < p_playlist->pp_items[i_pos]->i_options; i++ )
- free( p_playlist->pp_items[i_pos]->ppsz_options[i] );
-
- free( p_playlist->pp_items[i_pos]->ppsz_options );
- }
-
- /* XXX: what if the item is still in use? */
- free( p_playlist->pp_items[i_pos] );
-
- if( i_pos <= p_playlist->i_index )
- {
- p_playlist->i_index--;
- }
-
- /* Renumber the playlist */
- REMOVE_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos );
- if( p_playlist->i_enabled > 0 )
- p_playlist->i_enabled--;
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * Disables a playlist item
- *
- * \param p_playlist the playlist to disable from.
- * \param i_pos the position of the item to disable
- * \return returns 0
- */
-int playlist_Disable( playlist_t * p_playlist, int i_pos )
-{
- vlc_value_t val;
- vlc_mutex_lock( &p_playlist->object_lock );
-
-
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
- {
- msg_Dbg( p_playlist, "disabling playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( p_playlist->pp_items[i_pos]->b_enabled == VLC_TRUE )
- p_playlist->i_enabled--;
- p_playlist->pp_items[i_pos]->b_enabled = VLC_FALSE;
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * Enables a playlist item
- *
- * \param p_playlist the playlist to enable from.
- * \param i_pos the position of the item to enable
- * \return returns 0
- */
-int playlist_Enable( playlist_t * p_playlist, int i_pos )
-{
- vlc_value_t val;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
- {
- msg_Dbg( p_playlist, "enabling playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( p_playlist->pp_items[i_pos]->b_enabled == VLC_FALSE )
- p_playlist->i_enabled++;
-
- p_playlist->pp_items[i_pos]->b_enabled = VLC_TRUE;
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * Disables a playlist group
- *
- * \param p_playlist the playlist to disable from.
- * \param i_pos the id of the group to disable
- * \return returns 0
- */
-int playlist_DisableGroup( playlist_t * p_playlist, int i_group)
-{
- vlc_value_t val;
- int i;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- msg_Dbg(p_playlist,"Disabling group %i",i_group);
- for( i = 0 ; i< p_playlist->i_size; i++ )
- {
- if( p_playlist->pp_items[i]->i_group == i_group )
- {
- msg_Dbg( p_playlist, "disabling playlist item « %s »",
- p_playlist->pp_items[i]->psz_name );
-
- if( p_playlist->pp_items[i]->b_enabled == VLC_TRUE )
- p_playlist->i_enabled--;
-
- p_playlist->pp_items[i]->b_enabled = VLC_FALSE;
- }
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * Enables a playlist group
- *
- * \param p_playlist the playlist to enable from.
- * \param i_pos the id of the group to enable
- * \return returns 0
- */
-int playlist_EnableGroup( playlist_t * p_playlist, int i_group)
-{
- vlc_value_t val;
- int i;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- for( i = 0 ; i< p_playlist->i_size; i++ )
- {
- if( p_playlist->pp_items[i]->i_group == i_group )
- {
- msg_Dbg( p_playlist, "enabling playlist item « %s »",
- p_playlist->pp_items[i]->psz_name );
-
- if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
- p_playlist->i_enabled++;
-
- p_playlist->pp_items[i]->b_enabled = VLC_TRUE;
- }
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
-
-/**
- * Sort the playlist
- *
- */
-int playlist_Sort( playlist_t * p_playlist , int i_type )
-{
- int i , i_small , i_position;
- playlist_item_t *p_temp;
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
- for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
- {
- i_small = i_position;
- for( i = i_position + 1 ; i< p_playlist->i_size ; i++)
- {
- int i_test;
-
- i_test = strcasecmp( p_playlist->pp_items[i]->psz_name,
- p_playlist->pp_items[i_small]->psz_name );
-
- if( ( i_type == SORT_NORMAL && i_test < 0 ) ||
- ( i_type == SORT_REVERSE && i_test > 0 ) )
- {
- i_small = i;
- }
- }
- /* Keep the correct current index */
- if( i_small == p_playlist->i_index )
- p_playlist->i_index = i_position;
- else if( i_position == p_playlist->i_index )
- p_playlist->i_index = i_small;
-
- p_temp = p_playlist->pp_items[i_position];
- p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
- p_playlist->pp_items[i_small] = p_temp;
- }
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- return 0;
-}
-
-/**
- * Move an item in a playlist
- *
- * Move the item in the playlist with position i_pos before the current item
- * at position i_newpos.
- * \param p_playlist the playlist to move items in
- * \param i_pos the position of the item to move
- * \param i_newpos the position of the item that will be behind the moved item
- * after the move
- * \return returns 0
- */
-int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
-{
- vlc_value_t val;
- vlc_mutex_lock( &p_playlist->object_lock );
-
- /* take into account that our own row disappears. */
- if ( i_pos < i_newpos ) i_newpos--;
-
- if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size
- && i_newpos <= p_playlist->i_size )
- {
- playlist_item_t * temp;
-
- msg_Dbg( p_playlist, "moving playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- if( i_pos == p_playlist->i_index )
- {
- p_playlist->i_index = i_newpos;
- }
- else if( i_pos > p_playlist->i_index && i_newpos <= p_playlist->i_index )
- {
- p_playlist->i_index++;
- }
- else if( i_pos < p_playlist->i_index && i_newpos >= p_playlist->i_index )
- {
- p_playlist->i_index--;
- }
-
- if ( i_pos < i_newpos )
- {
- temp = p_playlist->pp_items[i_pos];
- while ( i_pos < i_newpos )
- {
- p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos+1];
- i_pos++;
- }
- p_playlist->pp_items[i_newpos] = temp;
- }
- else if ( i_pos > i_newpos )
- {
- temp = p_playlist->pp_items[i_pos];
- while ( i_pos > i_newpos )
- {
- p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos-1];
- i_pos--;
- }
- p_playlist->pp_items[i_newpos] = temp;
- }
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
-
- return 0;
-}
/**
* Do a playlist action
/* Tell above that we're ready */
vlc_thread_ready( p_playlist );
+ msg_Dbg(p_playlist,"pouet3");
+
while( !p_playlist->b_die )
{
vlc_mutex_lock( &p_playlist->object_lock );
p_playlist->p_input = input_CreateThread( p_playlist,
p_playlist->pp_items[p_playlist->i_index] );
}
-
-/*****************************************************************************
- * playlist_LoadFile: load a playlist file.
- ****************************************************************************/
-int playlist_LoadFile( playlist_t * p_playlist, const char *psz_filename )
-{
- FILE *file;
- char line[1024];
- int i_current_status;
- int i_format;
- int i;
-
- msg_Dbg( p_playlist, "opening playlist file %s", psz_filename );
-
- file = fopen( psz_filename, "rt" );
- if( !file )
- {
- msg_Err( p_playlist, "playlist file %s does not exist", psz_filename );
- return -1;
- }
- fseek( file, 0L, SEEK_SET );
-
- /* check the file is not empty */
- if ( ! fgets( line, 1024, file ) )
- {
- msg_Err( p_playlist, "playlist file %s is empty", psz_filename );
- fclose( file );
- return -1;
- }
-
- /* get rid of line feed */
- if( line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r' )
- {
- line[strlen(line)-1] = (char)0;
- if( line[strlen(line)-1] == '\r' ) line[strlen(line)-1] = (char)0;
- }
- /* check the file format is valid */
- if ( !strcmp ( line , PLAYLIST_FILE_HEADER_0_5 ) )
- {
- i_format = 5;
- }
- else if( !strcmp ( line , PLAYLIST_FILE_HEADER_0_6 ) )
- {
- i_format = 6;
- }
- else
- {
- msg_Err( p_playlist, "playlist file %s format is unsupported"
- , psz_filename );
- fclose( file );
- return -1;
- }
-
- /* stop playing */
- i_current_status = p_playlist->i_status;
- if ( p_playlist->i_status != PLAYLIST_STOPPED )
- {
- playlist_Stop ( p_playlist );
- }
-
- /* delete current content of the playlist */
- for( i = p_playlist->i_size - 1; i >= 0; i-- )
- {
- playlist_Delete ( p_playlist , i );
- }
-
- /* simply add each line */
- while( fgets( line, 1024, file ) )
- {
- /* ignore comments or empty lines */
- if( (line[0] == '#') || (line[0] == '\r') || (line[0] == '\n')
- || (line[0] == (char)0) )
- continue;
-
- /* get rid of line feed */
- if( line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r' )
- {
- line[strlen(line)-1] = (char)0;
- if( line[strlen(line)-1] == '\r' ) line[strlen(line)-1] = (char)0;
- }
- if( i_format == 5 )
- {
- playlist_Add ( p_playlist , (char *)&line ,
- 0, 0, PLAYLIST_APPEND , PLAYLIST_END );
- }
- else
- {
- msg_Warn( p_playlist, "Not supported yet");
- }
- }
-
- /* start playing */
- if ( i_current_status != PLAYLIST_STOPPED )
- {
- playlist_Play ( p_playlist );
- }
-
- fclose( file );
-
- return 0;
-}
-
-/*****************************************************************************
- * playlist_SaveFile: Save a playlist in a file.
- *****************************************************************************/
-int playlist_SaveFile( playlist_t * p_playlist, const char * psz_filename )
-{
- FILE *file;
- int i;
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
- msg_Dbg( p_playlist, "saving playlist file %s", psz_filename );
-
- file = fopen( psz_filename, "wt" );
- if( !file )
- {
- msg_Err( p_playlist , "could not create playlist file %s"
- , psz_filename );
- return -1;
- }
- /* Save is done in 0_5 mode at the moment*/
-
- fprintf( file , PLAYLIST_FILE_HEADER_0_5 "\n" );
-
- for ( i = 0 ; i < p_playlist->i_size ; i++ )
- {
- fprintf( file , p_playlist->pp_items[i]->psz_uri );
- fprintf( file , "\n" );
- }
-#if 0
- fprintf( file, PLAYLIST_FILE_HEADER_0_6 "\n" );
-
- for ( i=0 ; i< p_playlist->i_size ; i++ )
- {
- fprintf( file, p_playlist->pp_items[i]->psz_uri );
- fprintf( file, "||" );
- fprintf( file, p_playlist->pp_items[i]->psz_name );
- fprintf( file, "||" );
- fprintf( file, "%i",p_playlist->pp_items[i]->b_enabled = VLC_TRUE ?
- 1:0 );
- fprintf( file, "||" );
- fprintf( file, "%i", p_playlist->pp_items[i]->i_group );
- fprintf( file, "||" );
- fprintf( file, p_playlist->pp_items[i]->psz_author );
- fprintf( file , "\n" );
- }
-#endif
- fclose( file );
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- return 0;
-}
projects / vlc / commitdiff