* configure.ac : linked stream_out_standard to ws2_32 to fix build

* playlist.cpp : added "Random" and "Loop" checkboxes

diff --git a/configure.ac b/configure.ac
index 486349732f3dc3d11879358c7efd9c75576ad18b..0fa580f8468aa9d1dcad1a05d0e8489fe5b0374e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.60 2003/08/16 16:56:40 gbazin Exp $
+dnl $Id: configure.ac,v 1.61 2003/08/16 21:05:14 zorglub Exp $
 
 AC_INIT(vlc,0.6.3-cvs)
 
@@ -117,7 +117,7 @@ case "${target_os}" in
         # add ws2_32 for closesocket, select, recv
         CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
         AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
-        AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd],[-lws2_32])
+        AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
     fi
     ;;
   *nto*)

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index 7364aa0a78a9aab8851cc292c1895ebdec523951..8ef562cdddcf4d700d2262e7ac7aa0664a24ebe1 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -2,7 +2,7 @@
  * playlist.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: playlist.cpp,v 1.14 2003/07/20 10:38:49 gbazin Exp $
+ * $Id: playlist.cpp,v 1.15 2003/08/16 21:05:14 zorglub Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *
@@ -67,6 +67,8 @@ enum
 
     InvertSelection_Event,
     DeleteSelection_Event,
+    Random_Event,
+    Loop_Event,
     SelectAll_Event,
 
     /* controls */
@@ -83,6 +85,8 @@ BEGIN_EVENT_TABLE(Playlist, wxFrame)
     EVT_MENU(InvertSelection_Event, Playlist::OnInvertSelection)
     EVT_MENU(DeleteSelection_Event, Playlist::OnDeleteSelection)
     EVT_MENU(SelectAll_Event, Playlist::OnSelectAll)
+    EVT_CHECKBOX(Random_Event, Playlist::OnRandom)
+    EVT_CHECKBOX(Loop_Event, Playlist::OnLoop)
 
     /* Listview events */
     EVT_LIST_ITEM_ACTIVATED(ListView_Event, Playlist::OnActivateItem)
@@ -155,10 +159,26 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
     wxButton *close_button = new wxButton( playlist_panel, Close_Event,
                                            wxU(_("Close")) );
     close_button->SetDefault();
+   
+    /* Create the Random checkbox */
+    wxCheckBox *random_checkbox = 
+        new wxCheckBox( playlist_panel, Random_Event, wxU(_("Random")) );
+    int b_random = config_GetInt( p_intf, "random") ;
+    random_checkbox->SetValue( b_random );
+
+    /* Create the Loop Checkbox */
+    wxCheckBox *loop_checkbox = 
+        new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) );
+    int b_loop = config_GetInt( p_intf, "loop") ; 
+    loop_checkbox->SetValue( b_loop );
 
     /* Place everything in sizers */
     wxBoxSizer *close_button_sizer = new wxBoxSizer( wxHORIZONTAL );
     close_button_sizer->Add( close_button, 0, wxALL, 5 );
+    close_button_sizer->Add( random_checkbox, 0, 
+                            wxEXPAND|wxALIGN_RIGHT|wxALL, 5);
+    close_button_sizer->Add( loop_checkbox, 0, 
+                             wxEXPAND|wxALIGN_RIGHT|wxALL, 5);
     close_button_sizer->Layout();
     wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
     wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
@@ -401,6 +421,18 @@ void Playlist::OnDeleteSelection( wxCommandEvent& WXUNUSED(event) )
     Rebuild();
 }
 
+void Playlist::OnRandom( wxCommandEvent& event )
+{
+    config_PutInt( p_intf , "random" , 
+                  event.IsChecked() ? VLC_TRUE : VLC_FALSE );
+}
+void Playlist::OnLoop ( wxCommandEvent& event )
+{
+    config_PutInt( p_intf, "loop",
+                  event.IsChecked() ? VLC_TRUE : VLC_FALSE );    
+
+}
+
 void Playlist::OnSelectAll( wxCommandEvent& WXUNUSED(event) )
 {
     for( long item = 0; item < listview->GetItemCount(); item++ )
@@ -423,7 +455,6 @@ void Playlist::OnActivateItem( wxListEvent& event )
 
     vlc_object_release( p_playlist );
 }
-
 void Playlist::OnKeyDown( wxListEvent& event )
 {
     long keycode = event.GetKeyCode();

diff --git a/modules/gui/wxwindows/wxwindows.h b/modules/gui/wxwindows/wxwindows.h
index a8ab1e0874090fc5ef65952381e20e9f6184a3b0..893ff254d91dfe9e5f774207f6271f90a5717d48 100644 (file)
--- a/modules/gui/wxwindows/wxwindows.h
+++ b/modules/gui/wxwindows/wxwindows.h
@@ -2,7 +2,7 @@
  * wxwindows.h: private wxWindows interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.52 2003/08/14 19:25:56 sigmunau Exp $
+ * $Id: wxwindows.h,v 1.53 2003/08/16 21:05:14 zorglub Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -530,6 +530,8 @@ private:
     void OnInvertSelection( wxCommandEvent& event );
     void OnDeleteSelection( wxCommandEvent& event );
     void OnSelectAll( wxCommandEvent& event );
+    void OnRandom( wxCommandEvent& event );
+    void OnLoop ( wxCommandEvent& event );
     void OnActivateItem( wxListEvent& event );
     void OnKeyDown( wxListEvent& event );
     void Rebuild();