Uniformize source files encoding

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

diff --git a/modules/gui/skins2/commands/cmd_layout.cpp b/modules/gui/skins2/commands/cmd_layout.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 1e40b11..c1f9bbf
--- a/modules/gui/skins2/commands/cmd_layout.cpp
+++ b/modules/gui/skins2/commands/cmd_layout.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * cmd_layout.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * 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,7 +19,7 @@
  *
  * 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_layout.hpp"
@@ -28,32 +28,19 @@
 #include "../src/theme.hpp"
 
 
-CmdLayout::CmdLayout( intf_thread_t *pIntf, const string &windowId,
-                      const string &layoutId ):
-    CmdGeneric( pIntf ), m_windowId( windowId ), m_layoutId( layoutId )
+CmdLayout::CmdLayout( intf_thread_t *pIntf, TopWindow &rWindow,
+                      GenericLayout &rLayout ):
+    CmdGeneric( pIntf ), m_rWindow( rWindow ), m_rLayout( rLayout )
 {
 }
 
 
 void CmdLayout::execute()
 {
-    // Get the window and the layout
     if( !getIntf()->p_sys->p_theme )
     {
         return;
     }
-    TopWindow *pWindow =
-        getIntf()->p_sys->p_theme->getWindowById( m_windowId );
-    GenericLayout *pLayout =
-        getIntf()->p_sys->p_theme->getLayoutById( m_layoutId );
-    if( !pWindow || !pLayout )
-    {
-        msg_Err( getIntf(), "Cannot change layout (%s, %s)",
-                 m_windowId.c_str(), m_layoutId.c_str() );
-        return;
-    }
-
-    // XXX TODO: check that the layout isn't a layout of another window
-
-    pWindow->setActiveLayout( pLayout );
+    getIntf()->p_sys->p_theme->getWindowManager().setActiveLayout( m_rWindow,
+                                                                   m_rLayout );
 }