Changeset 12cbd4c8b63bcd5bfc077e24a11166171c421c38

Timestamp:

06/10/03 18:23:30 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[de2868c437d01f3d476d239ee787f255e1b699d2]

git-author:

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

Message:

* include/vlc_playlist.h

src/playlist/playlist.c:

• Implemented a boolean b_enabled to disable a playlist item
  
• Implemented the idea of group (p_item->i_group), that allows
  to enable/disable and to sort some series of items
  
• Implemented an unused (at the moment), psz_author field
  
• Started to implement a new playlist format to store all of these
  

* modules/gui/wxwindows/interface.cpp:

Added a hiddeable panel to put some important options.
(Menu Preferences->Extra GUI)
At the moment, we put the adjust filter and aspect ratio, and must
decide what options we want here

* modules/gui/wxwindows/playlist.cpp

modules/gui/wxwindows/iteminfo.cpp:

Added "Enable/disable group button", options to enable/disable selection
Added an item info dialog box

* modules/misc/sap.c :

Added a sap-group-id option: the SAP playlist items are in a separate group
(defaults to 42)

* modules/visualization/visual/effects.c:

Minor coding style fixes

Todo:

---

* Advanced sort (alphabetical and/or by group)
* Ability to load 0_6 playlists
* Really use the libid3tag

Files:

• include/vlc_playlist.h (modified) (6 diffs)
• modules/gui/wxwindows/Modules.am (modified) (1 diff)
• modules/gui/wxwindows/interface.cpp (modified) (16 diffs)
• modules/gui/wxwindows/iteminfo.cpp (added)
• modules/gui/wxwindows/playlist.cpp (modified) (23 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (10 diffs)
• modules/misc/sap.c (modified) (10 diffs)
• modules/visualization/visual/effects.c (modified) (19 diffs)
• src/playlist/playlist.c (modified) (20 diffs)

include/vlc_playlist.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-3 2003/09/08 12:02:16
+4 2003/10/06 16:23:30
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -11 +11 @@
- * 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
@@ -49 +49 @@
-    int        i_type;         /**< unused yet */
-    int        i_status;       /**< unused yet */
-e
+h
-                                * be deleted after playback. True mean
-                                * that this item is to be deleted
-                                * after playback, false otherwise */
+    vlc_bool_t b_enabled;      /**< Indicates whether this item is to be
+                                * played or skipped */
+
+    int        i_group;         /**< unused yet */
+    char *     psz_author;     /**< Author */
-};
-
@@ -74 +79 @@
-    playlist_status_t     i_status; /**< current status of playlist */
-    int                   i_size;   /**< total size of the list */
-
+
-    playlist_item_t **    pp_items; /**< array of pointers to the
-                                     * playlist items */
@@ -85 +90 @@
-#define SORT_NORMAL 0
-#define SORT_REVERSE 1
+
+#define PLAYLIST_TYPE_MANUAL 0
+#define PLAYLIST_TYPE_SAP 1
-
-/*****************************************************************************
@@ -106 +114 @@
-VLC_EXPORT( int,  playlist_AddItem, ( playlist_t *, playlist_item_t *, int, int ) );
-VLC_EXPORT( int,  playlist_Delete, ( playlist_t *, int ) );
+VLC_EXPORT( int,  playlist_Disable, ( playlist_t *, int ) );
+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( int,  playlist_Move, ( playlist_t *, int, int ) );

modules/gui/wxwindows/Modules.am

@@ -8 +8 @@
-    messages.cpp \
-    playlist.cpp \
+        iteminfo.cpp \
-    menus.cpp \
-    preferences.cpp \

modules/gui/wxwindows/interface.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-0 2003/09/07 22:53:09 fenrir
+1 2003/10/06 16:23:30 zorglub
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -126 +126 @@
-
-    Prefs_Event,
+    Extra_Event,
-
-    SliderScroll_Event,
@@ -135 +136 @@
-    FastStream_Event,
-
+    Adjust_Event,
+    Hue_Event,
+    Contrast_Event,
+    Brightness_Event,
+    Saturation_Event,
+
+    Ratio_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
@@ -152 +160 @@
-
-    EVT_MENU_OPEN(Interface::OnMenuOpen)
+
+    EVT_MENU( Extra_Event, Interface::OnExtra)
+    EVT_CHECKBOX( Adjust_Event, Interface::OnEnableAdjust)
+
+    EVT_COMBOBOX( Ratio_Event, Interface::OnRatio)
-
-#if defined( __WXMSW__ ) || defined( __WXMAC__ )
@@ -174 +187 @@
-    EVT_COMMAND_SCROLL(SliderScroll_Event, Interface::OnSliderUpdate)
-
+    EVT_COMMAND_SCROLL(Hue_Event, Interface::OnHueUpdate)
+    EVT_COMMAND_SCROLL(Contrast_Event, Interface::OnContrastUpdate)
+    EVT_COMMAND_SCROLL(Brightness_Event, Interface::OnBrightnessUpdate)
+    EVT_COMMAND_SCROLL(Saturation_Event, Interface::OnSaturationUpdate)
+
-END_EVENT_TABLE()
-
@@ -186 +204 @@
-    p_intf = _p_intf;
-    i_old_playing_status = PAUSE_S;
+    b_extra = VLC_FALSE;
-
-    /* Give our interface a nice little icon */
@@ -191 +210 @@
-
-    /* Create a sizer for the main frame */
-
+
+
-    SetSizer( frame_sizer );
-
@@ -199 +219 @@
-    p_dummy->SetFocus();
-    frame_sizer->Add( p_dummy );
-
+
-    /* Creation of the menu bar */
-    CreateOurMenuBar();
@@ -208 +228 @@
-    /* Creation of the slider sub-window */
-    CreateOurSlider();
-1, wxGROW
+0, wxEXPAND 
-    frame_sizer->Hide( slider_frame );
+
+    /* Create the extra panel */
+    CreateOurExtraPanel();
+    frame_sizer->Add( extra_frame, 0, wxEXPAND , 0 );
+    frame_sizer->Hide( extra_frame );
-
-    /* Creation of the status bar
@@ -261 +286 @@
-
-#define HELP_PREFS N_("Go to the preferences menu")
+#define EXTRA_PREFS N_("Open the extended GUI")
-
-#define HELP_ABOUT N_("About this program")
@@ -298 +324 @@
-    settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
-                           wxU(_(HELP_PREFS)) );
+    settings_menu->Append( Extra_Event, wxU(_("&Extra GUI") ),
+                           wxU(_(EXTRA_PREFS)) );
+
-
-    /* Create the "Audio" menu */
@@ -389 +418 @@
-    wxBoxSizer *toolbar_sizer = new wxBoxSizer( wxHORIZONTAL );
-    toolbar_sizer->Add( toolbar, 0, 0, 0 );
+
-    toolbar_sizer->Layout();
-
@@ -437 +467 @@
-    /* Hide the slider by default */
-    slider_frame->Hide();
+}
+
+
+void Interface::CreateOurExtraPanel()
+{
+    char *psz_filters;
+
+    extra_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize );
+    extra_frame->SetAutoLayout( TRUE );
+    wxBoxSizer *extra_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+    /* Create static box to surround the adjust controls */
+    adjust_box = new wxStaticBox( extra_frame, -1,
+                  wxT(_("Image adjust")) );
+
+    /* Create the size for the frame */
+    wxStaticBoxSizer *adjust_sizer =
+        new wxStaticBoxSizer( adjust_box, wxVERTICAL );
+    adjust_sizer->SetMinSize( -1, 50 );
+
+    /* Create every controls */
+
+    /* Create the adjust button */
+    wxCheckBox * adjust_check = new wxCheckBox( extra_frame, Adjust_Event,
+                                                 wxU(_("Enable")));
+
+
+    wxBoxSizer *hue_sizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *hue_text = new wxStaticText( extra_frame, -1,
+                                       wxU(_("Hue")) );
+    hue_slider = new wxSlider ( extra_frame, Hue_Event, 0, 0,
+                                360, wxDefaultPosition, wxDefaultSize );
+
+   hue_sizer->Add(hue_text,1, 0 ,0);
+   hue_sizer->Add(hue_slider,1, 0 ,0);
+   hue_sizer->Layout();
+
+    wxBoxSizer *contrast_sizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *contrast_text = new wxStaticText( extra_frame, -1,
+                                       wxU(_("Contrast")) );
+    contrast_slider = new wxSlider ( extra_frame, Contrast_Event, 0, 0,
+                                200, wxDefaultPosition, wxDefaultSize);
+    contrast_sizer->Add(contrast_text,1, 0 ,0);
+    contrast_sizer->Add(contrast_slider,1, 0 ,0);
+    contrast_sizer->Layout();
+
+    wxBoxSizer *brightness_sizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *brightness_text = new wxStaticText( extra_frame, -1,
+                                       wxU(_("Brightness")) );
+    brightness_slider = new wxSlider ( extra_frame, Brightness_Event, 0, 0,
+                           200, wxDefaultPosition, wxDefaultSize) ;
+    brightness_sizer->Add(brightness_text,1,0,0);
+    brightness_sizer->Add(brightness_slider,1,0,0);
+    brightness_sizer->Layout();
+
+    wxBoxSizer *saturation_sizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *saturation_text = new wxStaticText( extra_frame, -1,
+                                          wxU(_("Saturation")) );
+    saturation_slider = new wxSlider ( extra_frame, Saturation_Event, 0, 0,
+                           300, wxDefaultPosition, wxDefaultSize );
+    saturation_sizer->Add(saturation_text,1,0,0);
+    saturation_sizer->Add(saturation_slider,1,0,0);
+    saturation_sizer->Layout();
+
+    adjust_sizer->Add(adjust_check, 1, wxEXPAND, 0);
+    adjust_sizer->Add(hue_sizer, 1, wxEXPAND, 0);
+    adjust_sizer->Add(contrast_sizer, 1, wxEXPAND, 0);
+    adjust_sizer->Add(brightness_sizer, 1, wxEXPAND, 0);
+    adjust_sizer->Add(saturation_sizer, 1, wxEXPAND, 0);
+
+    extra_sizer->Add(adjust_sizer,1,wxBOTTOM,5);
+
+
+    /* Create static box to surround the other controls */
+    other_box = new wxStaticBox( extra_frame, -1,
+                  wxT(_("Video Options")) );
+
+    /* Create the sizer for the frame */
+    wxStaticBoxSizer *other_sizer =
+        new wxStaticBoxSizer( other_box, wxVERTICAL );
+    other_sizer->SetMinSize( -1, 50 );
+
+    static const wxString ratio_array[] =
+    {
+        wxT("4:3"),
+        wxT("16:9"),
+    };
+
+    wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
+                                          wxU(_("Ratio")) );
+
+    ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
+                                  wxDefaultPosition, wxSize(120,-1),
+                                  WXSIZEOF(ratio_array), ratio_array,
+                                  0 );
+
+    ratio_sizer->Add( ratio_text, 0, wxALL, 2 );
+    ratio_sizer->Add( ratio_combo, 0, wxALL, 2 );
+    ratio_sizer->Layout();
+
+    other_sizer->Add(ratio_sizer,0,wxALL,0 );
+
+    extra_sizer->Add(other_sizer,0,wxBOTTOM,5);
+
+    extra_frame->SetSizer( extra_sizer );
+
+    /* Layout the whole panel */
+    extra_sizer->Layout();
+
+    extra_sizer->SetSizeHints(extra_frame);
+
+    /* Write down initial values */
+    psz_filters = config_GetPsz( p_intf, "filter" );
+
+    if(psz_filters == NULL) psz_filters=strdup("");
+
+    if( strstr(psz_filters,"adjust") )
+    {
+        adjust_check->SetValue( 1 );
+        saturation_slider->Enable();
+        contrast_slider->Enable();
+        brightness_slider->Enable();
+        hue_slider->Enable();
+    }
+    else
+    {
+        adjust_check->SetValue( 0 );
+        saturation_slider->Disable();
+        contrast_slider->Disable();
+        brightness_slider->Disable();
+        hue_slider->Disable();
+    }
+
+    extra_frame->Hide();
+    free(psz_filters);
-}
-
@@ -470 +636 @@
-    if( !accel.Ok() )
-        msg_Err( p_intf, "invalid accelerator table" );
-
+
-    SetAcceleratorTable( accel );
-    msg_Dbg( p_intf, "accelerator table loaded" );
-
-
+
+
+
+
-
-/*****************************************************************************
@@ -660 +828 @@
-}
-
+void Interface::OnExtra(wxCommandEvent& event)
+{
+    if( b_extra == VLC_FALSE)
+    {
+        extra_frame->Show();
+        frame_sizer->Show( extra_frame );
+        b_extra = VLC_TRUE;
+    }
+    else
+    {
+        extra_frame->Hide();
+        frame_sizer->Hide( extra_frame );
+        b_extra = VLC_FALSE;
+    }
+    frame_sizer->Layout();
+    frame_sizer->Fit(this);
+}
+
+void Interface::OnEnableAdjust(wxCommandEvent& event)
+{
+    char *psz_filters=config_GetPsz( p_intf, "filter");
+    char *psz_new = NULL;
+    if( event.IsChecked() )
+    {
+        if(psz_filters == NULL)
+        {
+            psz_new = strdup( "adjust" );
+        }
+        else
+        {
+            psz_new= (char *) malloc(strlen(psz_filters) + 8 );
+            sprintf( psz_new, "%s:adjust", psz_filters);
+        }
+        config_PutPsz( p_intf, "filter", psz_new );
+
+        brightness_slider->Enable();
+        saturation_slider->Enable();
+        contrast_slider->Enable();
+        hue_slider->Enable();
+    }
+    else
+    {
+        if( psz_filters != NULL )
+        {
+
+            char *psz_current;
+            unsigned int i=0;
+            for( i = 0; i< strlen(psz_filters ); i++)
+            {
+                if ( !strncasecmp( &psz_filters[i],"adjust",6 ))
+                {
+                    if(i > 0)
+                        if( psz_filters[i-1] == ':' ) i--;
+                    psz_current = strchr( &psz_filters[i+1] , ':' );
+                    if( !psz_current )
+                        psz_filters[i] = '\0';
+                    else
+                    {
+                       memmove( &psz_filters[i] , psz_current,
+                                &psz_filters[strlen(psz_filters)]-psz_current
+                                +1);
+                    }
+                }
+            }
+            config_PutPsz( p_intf, "filter", psz_filters);
+        }
+        brightness_slider->Disable();
+        saturation_slider->Disable();
+        contrast_slider->Disable();
+        hue_slider->Disable();
+    }
+    if(psz_filters) free(psz_filters);
+    if(psz_new) free(psz_new);
+}
+
+void Interface::OnHueUpdate( wxScrollEvent& event)
+{
+   config_PutInt( p_intf , "hue" , event.GetPosition() );
+}
+
+void Interface::OnSaturationUpdate( wxScrollEvent& event)
+{
+   config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/300 );
+}
+
+void Interface::OnBrightnessUpdate( wxScrollEvent& event)
+{
+   config_PutFloat( p_intf , "brightness", (float)event.GetPosition()/200 );
+}
+
+void Interface::OnContrastUpdate(wxScrollEvent& event)
+{
+   config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/200 );
+
+}
+
+void Interface::OnRatio( wxCommandEvent& event )
+{
+   config_PutPsz( p_intf, "aspect-ratio", ratio_combo->GetValue() );
+}
+
+
-void Interface::OnPlayStream( wxCommandEvent& WXUNUSED(event) )
-{
@@ -668 +938 @@
-    if( p_playlist == NULL ) return;
-
-
+&& p_playlist->i_enabled 
-    {
-        vlc_value_t state;

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-1 2003/09/22 14:40:1
+2 2003/10/06 16:23:3
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -56 +56 @@
-    Save_Event,
-
+    EnableSelection_Event,
+    DisableSelection_Event,
+
-    InvertSelection_Event,
-    DeleteSelection_Event,
@@ -62 +65 @@
-    Repeat_Event,
-    SelectAll_Event,
+
+    En_Dis_Event,
+
+    Infos_Event,
-
-    SearchText_Event,
@@ -79 +86 @@
-    EVT_MENU(Open_Event, Playlist::OnOpen)
-    EVT_MENU(Save_Event, Playlist::OnSave)
+    EVT_MENU(EnableSelection_Event, Playlist::OnEnableSelection)
+    EVT_MENU(DisableSelection_Event, Playlist::OnDisableSelection)
-    EVT_MENU(InvertSelection_Event, Playlist::OnInvertSelection)
-    EVT_MENU(DeleteSelection_Event, Playlist::OnDeleteSelection)
-    EVT_MENU(SelectAll_Event, Playlist::OnSelectAll)
+    EVT_MENU(Infos_Event, Playlist::OnInfos)
-    EVT_CHECKBOX(Random_Event, Playlist::OnRandom)
-    EVT_CHECKBOX(Repeat_Event, Playlist::OnRepeat)
@@ -92 +102 @@
-    /* 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_TEXT(SearchText_Event, Playlist::OnSearchTextChange)
@@ -109 +121 @@
-{
-    /* Initializations */
+    iteminfo_dialog = NULL;
-    p_intf = _p_intf;
-    vlc_value_t  val;
@@ -136 +149 @@
-    /* Create our "Selection" menu */
-    wxMenu *selection_menu = new wxMenu;
+    selection_menu->Append( EnableSelection_Event, wxU(_("&Enable")) );
+    selection_menu->Append( DisableSelection_Event, wxU(_("&Disable")) );
+    selection_menu->AppendSeparator();
-    selection_menu->Append( InvertSelection_Event, wxU(_("&Invert")) );
-    selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) );
@@ -162 +178 @@
-    listview->InsertColumn( 0, wxU(_("Url")) );
-    #if 0
-   
+        
-    #endif
-    listview->SetColumnWidth( 0, 300 );
-    #if 0
-   
+        
-    #endif
-
-    /* Create the Random checkbox */
- 
+
-        new wxCheckBox( playlist_panel, Random_Event, wxU(_("Random")) );
-
+
-    var_Get( p_intf, "random", &val);
-    vlc_bool_t b_random = val.b_bool;
@@ -178 +194 @@
-
-    /* Create the Loop Checkbox */
- 
+
-        new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) );
-
-    var_Get( p_intf, "loop", &val );
- 
+
-    loop_checkbox->SetValue( b_loop );
-
-    /* Create the Repeat one checkbox */
- 
-   
+
+        
-
-    var_Get( p_intf, "repeat", &val );
- 
+
-    repeat_checkbox->SetValue( b_repeat );
-
-    /* Create the Search Textbox */
-    search_text =
-
-
-
+
+
+
-
-    /* Create the search button */
-
-
-
-
+
+
+
+
+
+
+
+
-    /* Place everything in sizers */
-
-
-
-
-
-
-
-
+
+
+
-    button_sizer->Layout();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    search_sizer->Add( search_text, 0, wxALL|wxALIGN_CENTER, 5);
-    search_sizer->Add( search_button, 0, wxALL|wxALIGN_CENTER, 5);
@@ -221 +247 @@
-    search_sizer->Layout();
-
-HORIZONT
-search_sizer 
+VERTIC
+checkbox_sizer
-    bottom_sizer->Add( button_sizer , 0, wxALL|wxALIGN_CENTER, 5 );
-
+
-    bottom_sizer->Layout();
-
@@ -231 +257 @@
-    wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
-    panel_sizer->Add( listview, 1, wxEXPAND | wxALL, 5 );
-
+
+
-    panel_sizer->Add( bottom_sizer, 0 , wxALIGN_CENTRE);
-    panel_sizer->Layout();
@@ -271 +298 @@
-    }
-
+    delete iteminfo_dialog;
+
-    var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
-    vlc_object_release( p_playlist );
@@ -294 +323 @@
-        wxString filename = wxU(p_playlist->pp_items[i]->psz_name);
-        listview->InsertItem( i, filename );
+        if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
+        {
+            wxListItem listitem;
+            listitem.m_itemId = i;
+            listitem.SetTextColour( *wxLIGHT_GREY);
+            listview->SetItem(listitem);
+        }
-        /* FIXME: we should try to find the actual duration... */
-   
-   
-       
-   
+        
+        
+            
+        
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
@@ -308 +344 @@
-    listview->SetItem( listitem );
-
-//    listview->Select( p_playlist->i_index, TRUE );
-    listview->Focus( p_playlist->i_index );
-
@@ -466 +501 @@
-
-    playlist_Sort( p_playlist , 0  );
-
+
-    vlc_object_release( p_playlist );
-
@@ -485 +520 @@
-
-    playlist_Sort( p_playlist , 1 );
-
+
-    vlc_object_release( p_playlist );
-
@@ -495 +530 @@
-void Playlist::OnSearchTextChange( wxCommandEvent& WXUNUSED(event) )
-{
- 
+
-}
-
@@ -503 +538 @@
-
-    int i_current;
- 
+
-    int i_item = -1;
-
-    for( i_current = 0 ; i_current <= listview->GetItemCount() ; i_current++ ) 
-    {
-   
-       
-   
-   
-   
-   
-
-
-
-        ;
-
-   
-  
-   
-   
-   
-   
-   
-   
+        
+                   
+        
+        
+        
+        
+
+
+ ; 
+         
+
+        
+       
+        
+        
+        
+         
+         
+        
-    }
-    for( long item = 0; item < listview->GetItemCount(); item++ )
@@ -563 +598 @@
-}
-
+void Playlist::OnEnableSelection( wxCommandEvent& WXUNUSED(event) )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+
+    for( long item = listview->GetItemCount() - 1; item >= 0; item-- )
+    {
+        if( listview->IsSelected( item ) )
+        {
+            playlist_Enable( p_playlist, item );
+        }
+    }
+    vlc_object_release( p_playlist);
+    Rebuild();
+}
+
+void Playlist::OnDisableSelection( wxCommandEvent& WXUNUSED(event) )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+
+    for( long item = listview->GetItemCount() - 1; item >= 0; item-- )
+    {
+        if( listview->IsSelected( item ) )
+        {
+            playlist_Disable( p_playlist, item );
+        }
+    }
+    vlc_object_release( p_playlist);
+    Rebuild();
+}
+
-void Playlist::OnRandom( wxCommandEvent& event )
-{
-    vlc_value_t val;
-    val.b_bool = event.IsChecked();
-// ? VLC_TRUE : VLC_FALSE ;
-    playlist_t *p_playlist =
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -582 +658 @@
-    vlc_value_t val;
-    val.b_bool = event.IsChecked();
-// ? VLC_TRUE : VLC_FALSE ;
-    playlist_t *p_playlist =
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -598 +673 @@
-    vlc_value_t val;
-    val.b_bool = event.IsChecked();
-// ? VLC_TRUE : VLC_FALSE ;
-    playlist_t *p_playlist =
-        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -627 +701 @@
-        return;
-    }
-
-    playlist_Goto( p_playlist, event.GetIndex() );
-
@@ -643 +716 @@
-}
-
+void Playlist::OnInfos( wxCommandEvent& WXUNUSED(event) )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+
+    if( iteminfo_dialog == NULL )
+    {
+        /* 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 )
+        {
+            iteminfo_dialog = new ItemInfoDialog(
+                              p_intf, p_playlist->pp_items[i_item], this );
+            if( iteminfo_dialog->ShowModal()  == wxID_OK )
+                Rebuild();
+            delete iteminfo_dialog;
+            iteminfo_dialog = NULL;
+        }
+    }
+    vlc_object_release( p_playlist );
+}
+
+
+void Playlist::OnEnDis( wxCommandEvent& WXUNUSED(event) )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                       FIND_ANYWHERE );
+    if( p_playlist == NULL )
+    {
+        return;
+    }
+
+    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 )
+    {
+       if( p_playlist->pp_items[i_item]->b_enabled == VLC_TRUE)
+           playlist_DisableGroup( p_playlist ,
+                                  p_playlist->pp_items[i_item]->i_group );
+       else
+           playlist_EnableGroup( p_playlist ,
+                                  p_playlist->pp_items[i_item]->i_group );
+       Rebuild();
+    }
+
+    vlc_object_release( p_playlist );
+}
-/*****************************************************************************
- * PlaylistChanged: callback triggered by the intf-change playlist variable

modules/gui/wxwindows/wxwindows.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-2 2003/09/22 14:40:1
+3 2003/10/06 16:23:3
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -142 +142 @@
-    void TogglePlayButton( int i_playing_status );
-
+//    wxFlexGridSizer *frame_sizer;
-    wxBoxSizer  *frame_sizer;
-    wxStatusBar *statusbar;
@@ -147 +148 @@
-    wxSlider    *slider;
-    wxWindow    *slider_frame;
+    wxWindow    *extra_frame;
-    wxStaticBox *slider_box;
+
+    vlc_bool_t b_extra;
+
+    wxStaticBox *adjust_box;
+    wxSlider *brightness_slider;
+    wxSlider *contrast_slider;
+    wxSlider *saturation_slider;
+    wxSlider *hue_slider;
+
+    wxStaticBox *other_box;
+    wxComboBox *ratio_combo;
-
-    wxGauge     *volctrl;
@@ -155 +168 @@
-    void CreateOurMenuBar();
-    void CreateOurToolBar();
+    void CreateOurExtraPanel();
-    void CreateOurSlider();
-    void Open( int i_access_method );
@@ -168 +182 @@
-    void OnOpenSat( wxCommandEvent& event );
-    void OnOpenV4L( wxCommandEvent& event );
+    void OnExtra( wxCommandEvent& event );
-    void OnShowDialog( wxCommandEvent& event );
-    void OnPlayStream( wxCommandEvent& event );
@@ -176 +191 @@
-    void OnSlowStream( wxCommandEvent& event );
-    void OnFastStream( wxCommandEvent& event );
+
+    void OnEnableAdjust( wxCommandEvent& event );
+    void OnHueUpdate( wxScrollEvent& event );
+    void OnContrastUpdate( wxScrollEvent& event );
+    void OnBrightnessUpdate( wxScrollEvent& event );
+    void OnSaturationUpdate( wxScrollEvent& event );
+
+    void OnRatio( wxCommandEvent& event );
-
-    void OnMenuOpen( wxMenuEvent& event );
@@ -639 +662 @@
-
-/* Playlist */
+class ItemInfoDialog;
-class Playlist: public wxFrame
-{
@@ -662 +686 @@
-    void OnClose( wxCommandEvent& event );
-    void OnSearch( wxCommandEvent& event );
+    void OnEnDis( wxCommandEvent& event );
+    void OnInfos( wxCommandEvent& event );
-    void OnSearchTextChange( wxCommandEvent& event );
-    void OnOpen( wxCommandEvent& event );
-    void OnSave( wxCommandEvent& event );
+    void OnEnableSelection( wxCommandEvent& event );
+    void OnDisableSelection( wxCommandEvent& event );
-    void OnInvertSelection( wxCommandEvent& event );
-    void OnDeleteSelection( wxCommandEvent& event );
@@ -676 +704 @@
-
-    wxTextCtrl *search_text;
-
-
+
+
+
+
+
-
-    intf_thread_t *p_intf;
@@ -683 +714 @@
-    int i_update_counter;
-};
+
+
+/* ItemInfo Dialog */
+class ItemInfoDialog: public wxDialog
+{
+public:
+    /* Constructor */
+    ItemInfoDialog( intf_thread_t *p_intf, playlist_item_t *_p_item,