Fix MRL generation for open dialog in order to stream. (#1575)

[vlc] / modules / gui / skins2 / commands / cmd_input.cpp

diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp
index d6b4e944a6bf903b2a29d35a9f0940474f90236d..0aafe14db548a8a2636628c611f482b128afd110 100644 (file)
--- a/modules/gui/skins2/commands/cmd_input.cpp
+++ b/modules/gui/skins2/commands/cmd_input.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * cmd_input.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: cmd_input.cpp,v 1.2 2004/01/18 19:54:45 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +19,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "cmd_input.hpp"
-
+#include "cmd_dialogs.hpp"
+#include <vlc_aout.h>
+#include <vlc_input.h>
+#include <vlc_playlist.h>
 
 void CmdPlay::execute()
 {
@@ -33,7 +36,14 @@ void CmdPlay::execute()
         return;
     }
 
-    playlist_Play( pPlaylist );
+    if( !playlist_IsEmpty( pPlaylist ) )
+        playlist_Play( pPlaylist );
+    else
+    {
+        // If the playlist is empty, open a file requester instead
+        CmdDlgFile cmd( getIntf() );
+        cmd.execute();
+    }
 }
 
 
@@ -69,7 +79,7 @@ void CmdSlower::execute()
     if( pInput )
     {
         vlc_value_t val;
-        val.b_bool = VLC_TRUE;
+        val.b_bool = true;
 
         var_Set( pInput, "rate-slower", val );
         vlc_object_release( pInput );
@@ -85,10 +95,28 @@ void CmdFaster::execute()
     if( pInput )
     {
         vlc_value_t val;
-        val.b_bool = VLC_TRUE;
+        val.b_bool = true;
 
         var_Set( pInput, "rate-faster", val );
         vlc_object_release( pInput );
     }
 }
 
+
+void CmdMute::execute()
+{
+    aout_VolumeMute( getIntf(), NULL );
+}
+
+
+void CmdVolumeUp::execute()
+{
+    aout_VolumeUp( getIntf(), 1, NULL );
+}
+
+
+void CmdVolumeDown::execute()
+{
+    aout_VolumeDown( getIntf(), 1, NULL );
+}
+