Changeset 5dc722b5545a43b46db156ab1031da89c512e4ab

Timestamp:

11/01/04 01:45:06 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1073781906 +0000

git-parent:

[0bbccbb10fc81f28af8ff7ccb8a402e03a5119c2]

git-author:

Clément Stenac <zorglub@videolan.org> 1073781906 +0000

Message:

* configure.ac : Added new folders

* New playlist import/export system:

-export plugin in misc/playlist (contains one module for each file type)
-open plugin = special demuxer2, that can be opened from the command

line or the graphical interface.

NB: the demuxer "playlist" is forced to earn speed, but this does not
work yet, as we have a demux2

* modules/gui/wxwindows: use the new import/export.

* src/playlist/group.c : fixed boundary check

* src/playlist/item-ext.c: correctly reset stuff when clearing the playlist

Files:

• configure.ac (modified) (3 diffs)
• include/vlc_common.h (modified) (2 diffs)
• include/vlc_playlist.h (modified) (3 diffs)
• modules/demux/playlist/Modules.am (added)
• modules/demux/playlist/m3u.c (added)
• modules/demux/playlist/old.c (added)
• modules/demux/playlist/playlist.c (added)
• modules/gui/wxwindows/playlist.cpp (modified) (10 diffs)
• modules/gui/wxwindows/preferences.cpp (modified) (2 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (3 diffs)
• modules/misc/playlist/export.c (added)
• modules/misc/playlist/m3u.c (added)
• modules/misc/playlist/native.c (added)
• modules/misc/playlist/old.c (added)
• src/playlist/group.c (modified) (2 diffs)
• src/playlist/item-ext.c (modified) (2 diffs)
• src/playlist/loadsave.c (modified) (3 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-8 2004/01/09 18:32:03 gbazin
+9 2004/01/11 00:45:06 zorglub
-
-AC_INIT(vlc,0.7.1-cvs)
@@ -3587 +3587 @@
-  modules/demux/mp4/Makefile
-  modules/demux/mpeg/Makefile
+  modules/demux/playlist/Makefile
-  modules/demux/util/Makefile
-  modules/gui/Makefile
@@ -3607 +3608 @@
-  modules/misc/network/Makefile
-  modules/misc/testsuite/Makefile
+  modules/misc/playlist/Makefile
-  modules/mux/Makefile
-  modules/mux/mpeg/Makefile

include/vlc_common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-1 2004/01/09 18:32:03 gbazin
+2 2004/01/11 00:45:06 zorglub
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -193 +193 @@
-typedef struct item_info_t item_info_t;
-typedef struct item_info_category_t item_info_category_t;
+typedef struct playlist_export_t playlist_export_t;
-
-/* Modules */

include/vlc_playlist.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-3 2004/01/10 14:24:33 hartman
+4 2004/01/11 00:45:06 zorglub
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -55 +55 @@
-    int i_infos;                /**< Number of infos in the category */
-    item_info_t **pp_infos;     /**< Pointer to an array of infos */
+};
+
+/**
+ * playlist export helper structure
+ */
+struct playlist_export_t
+{
+    char *psz_filename;
+    FILE *p_file;
-};
-
@@ -210 +219 @@
-
-/* Load/Save */
-LoadFile
-SaveFile, ( playlist_t
+Import
+Export, ( playlist_t *, const char
-
-/**

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
-5 2004/01/10 03:36:03 hartman
+6 2004/01/11 00:45:06 zorglub
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -87 +87 @@
-
-    /* controls */
-
+
+
+
-};
-
@@ -153 +155 @@
-    EVT_BUTTON( wxID_OK, NewGroup::OnOk)
-    EVT_BUTTON( wxID_CANCEL, NewGroup::OnCancel)
+END_EVENT_TABLE()
+
+
+/* Event Table for the ExportPlaylist class */
+BEGIN_EVENT_TABLE(ExportPlaylist, wxDialog)
+    EVT_BUTTON( wxID_OK, ExportPlaylist::OnOk)
+    EVT_BUTTON( wxID_CANCEL, ExportPlaylist::OnCancel)
+    EVT_BUTTON( Browse_Event, ExportPlaylist::OnBrowse)
-END_EVENT_TABLE()
-
@@ -409 +419 @@
-        return;
-    }
- p_playlist->i_size
+= p_playlist->i_size || !p_playlist->pp_items[i]
-    {
-        vlc_object_release(p_playlist);
@@ -416 +426 @@
-    listview->SetItem( i, 0, wxL2U(p_playlist->pp_items[i]->psz_name) );
-    listview->SetItem( i, 1, wxL2U( playlist_GetInfo( p_playlist, i,
-
+
+
+
-    listview->SetItem( i, 2,
-
-
+
-
-    if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
@@ -578 +589 @@
-void Playlist::OnSave( wxCommandEvent& WXUNUSED(event) )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -612 +609 @@
-    if( dialog.ShowModal() == wxID_OK )
-    {
-LoadFile
+Import
-    }
-
@@ -1154 +1151 @@
-
-/***************************************************************************
-
+ Class
- ***************************************************************************/
-NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ):
@@ -1219 +1216 @@
-            psz_name = NULL;
-        }
-}
-
-
+    vlc_object_release( p_playlist );
+
+
-    EndModal( wxID_OK );
-}
@@ -1229 +1226 @@
-    EndModal( wxID_CANCEL );
-}
+
+
+
+/***************************************************************************
+ * Export playlist class
+ ***************************************************************************/
+ExportPlaylist::ExportPlaylist( intf_thread_t *_p_intf, wxWindow *_p_parent ):
+    wxDialog( _p_parent, -1, wxU(_("Export playlist")), wxDefaultPosition,
+             wxDefaultSize, wxDEFAULT_FRAME_STYLE )
+{
+    vlc_list_t *p_list;
+    module_t *p_module;
+
+    /* Initializations */
+    p_intf = _p_intf;
+    SetIcon( *p_intf->p_sys->p_icon );
+
+    /* Create a panel to put everything in*/
+    wxPanel *panel = new wxPanel( this, -1 );
+    panel->SetAutoLayout( TRUE );
+
+    /* Create the file box */
+    wxStaticBox *file_box = new wxStaticBox( panel, -1,
+                                             wxU(_("File to save to")) );
+    wxStaticBoxSizer *file_sizer = new wxStaticBoxSizer( file_box,
+                                                        wxHORIZONTAL );
+
+    file_text = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition,
+                               wxSize(250,-1),wxTE_PROCESS_ENTER);
+
+    file_text->SetToolTip( wxU(_("Enter the name of the file to export "
+                                 "the playlist to.")) );
+
+    wxButton *file_button = new wxButton( panel, Browse_Event,
+                                          wxU(_("Browse")) );
+
+    file_sizer->Add( file_text, 0, wxALL | wxALIGN_CENTER , 5 );
+    file_sizer->Add( file_button, 0, wxALL | wxALIGN_CENTER , 5 );
+
+    /* Create the type box */
+    wxStaticBox *type_box = new wxStaticBox( panel, -1,
+                                             wxU(_("Select export type")) );
+
+    wxStaticBoxSizer *type_sizer = new wxStaticBoxSizer( type_box,
+                                                        wxHORIZONTAL );
+
+    type_combo = new wxComboBox( panel, -1, wxT(""), wxDefaultPosition,
+                                 wxSize(250, -1), 0, NULL );
+
+    type_sizer->Add( type_combo, 0, wxALL | wxALIGN_CENTER, 5 );
+    type_sizer->Layout();
+
+
+
+    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( file_sizer, 0, wxEXPAND | wxALL, 5 );
+    panel_sizer->Add( type_sizer, 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 );
+
+    /* build a list of available modules */
+    p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+    for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        p_module = (module_t *)p_list->p_values[i_index].p_object ;
+        if( !strcmp( p_module->psz_capability, "playlist export" ) )
+        {
+            type_combo->Append( wxU(p_module->psz_longname),
+                                p_module->pp_shortcuts[1] ?
+                                p_module->pp_shortcuts[1] :
+                                p_module->psz_object_name );
+        }
+    }
+    vlc_list_release( p_list );
+}
+
+
+ExportPlaylist::~ExportPlaylist()
+{
+}
+
+void ExportPlaylist::OnOk( wxCommandEvent& WXUNUSED(event) )
+{
+    playlist_t * p_playlist =
+          (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+
+    if( p_playlist )
+    {
+        char *psz_type = (char *)type_combo->GetClientData(
+                                             type_combo->GetSelection() );
+        if( file_text->GetValue().mb_str() && psz_type )
+        {
+            playlist_Export( p_playlist, file_text->GetValue().mb_str(),
+                             psz_type );
+        }
+    }
+
+    vlc_object_release( p_playlist );
+    EndModal( wxID_OK );
+}
+
+void ExportPlaylist::OnCancel( wxCommandEvent& WXUNUSED(event) )
+{
+    EndModal( wxID_CANCEL );
+}
+
+void ExportPlaylist::OnBrowse( wxCommandEvent& WXUNUSED(event) )
+{
+    wxFileDialog dialog( this, wxU(_("Save playlist")),
+                         wxT(""), wxT(""), wxT("*"), wxSAVE );
+
+    if( dialog.ShowModal() == wxID_OK )
+    {
+        file_text->SetValue( dialog.GetPath() );
+    }
+}

modules/gui/wxwindows/preferences.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-4 2003/12/22 02:24:52 sam
+5 2004/01/11 00:45:06 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -329 +329 @@
-        return i_type == 1 ? VIDEO_FILTER_TITLE : VIDEO_FILTER_HELP;
-
-
+ 
-}
-

modules/gui/wxwindows/wxwindows.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-3 2004/01/05 13:00:39
+4 2004/01/11 00:45:06
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -741 +741 @@
-class ItemInfoDialog;
-class NewGroup;
+class ExportPlaylist;
-class Playlist: public wxFrame
-{
@@ -842 +843 @@
-};
-
+class ExportPlaylist: public wxDialog
+{
+public:
+    /* Constructor */
+    ExportPlaylist(intf_thread_t *p_intf, wxWindow *p_parent );
+    virtual ~ExportPlaylist();
+
+private:
+    /* Event handlers (these functions should _not_ be virtual) */
+    void OnOk( wxCommandEvent& event );
+    void OnCancel( wxCommandEvent& event );
+    void OnBrowse( wxCommandEvent& event );
+
+    DECLARE_EVENT_TABLE();
+    intf_thread_t *p_intf;
+    wxTextCtrl *file_text;
+    wxComboBox *type_combo;
+};
-
-/* ItemInfo Dialog */

src/playlist/group.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-6 2004/01/06 08:50:20
+7 2004/01/11 00:45:06
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -120 +120 @@
-{
-    int i;
-=
+
-    {
-        if( p_playlist->pp_groups[i]->i_id == i_id )

src/playlist/item-ext.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-7 2004/01/10 14:24:33 hartman
+8 2004/01/11 00:45:06 zorglub
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -388 +388 @@
-        playlist_Delete( p_playlist, 0 );
-    }
+
+    p_playlist->i_index = -1;
+    p_playlist->i_size = 0;
+    p_playlist->pp_items = NULL;
+
+    p_playlist->i_groups = 0;
+    p_playlist->pp_groups = NULL;
+
-    return 0;
-}

src/playlist/loadsave.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
-3 2004/01/06 08:50:20
+4 2004/01/11 00:45:06
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -34 +34 @@
-#include "vlc_playlist.h"
-
-
-
+
-
-
-/*****************************************************************************
-LoadFile
+Import
- ****************************************************************************/
-LoadFile
+Import
-{
-
-
-
-
-
+
+
+
-
-opening playlist file %s", psz_filename 
+clearing playlist"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-
-
+
-    }
-fseek( file, 0L, SEEK_SET );
+*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -142 +76 @@
- * playlist_SaveFile: Save a playlist in a file.
- *****************************************************************************/
-
+
+
-{
-
-
+
+
+
-
+    msg_Info( p_playlist, "Saving playlist to file %s", psz_filename );
+
+    /* Prepare the playlist_export_t structure */
+    p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) );
+    if( !p_export)
+    {
+        msg_Err( p_playlist, "Out of memory");
+        return VLC_ENOMEM;
+    }
+    p_export->p_file = fopen( psz_filename, "wt" );
+    if( !p_export->p_file )
+    {
+        msg_Err( p_playlist , "Could not create playlist file %s (%s)"
+                , psz_filename, strerror(errno) );
+        return -1;
+    }
+
+    p_playlist->p_private = (void *)p_export;
+    /* Lock the playlist */
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-0
+VLC_SUCCESS
-}