Commit dc25da7e authored by Erwan Tulou's avatar Erwan Tulou

skins2: remove dead code

parent 9794aa06
...@@ -38,8 +38,6 @@ SOURCES_skins2 = \ ...@@ -38,8 +38,6 @@ SOURCES_skins2 = \
commands/cmd_snapshot.cpp \ commands/cmd_snapshot.cpp \
commands/cmd_snapshot.hpp \ commands/cmd_snapshot.hpp \
commands/cmd_show_window.hpp \ commands/cmd_show_window.hpp \
commands/cmd_update_item.cpp \
commands/cmd_update_item.hpp \
commands/cmd_vars.cpp \ commands/cmd_vars.cpp \
commands/cmd_vars.hpp \ commands/cmd_vars.hpp \
\ \
......
/*****************************************************************************
* cmd_update_item.cpp
*****************************************************************************
* Copyright (C) 2003-2009 the VideoLAN team
* $Id$
*
* Authors: Cyril Deguet <asmax@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
* 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_playlist.h>
#include "../src/os_factory.hpp"
#include "async_queue.hpp"
#include "cmd_vars.hpp"
#include "cmd_update_item.hpp"
void CmdUpdateItem::execute()
{
playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
if( pPlaylist == NULL )
return;
input_thread_t *p_input = playlist_CurrentInput( pPlaylist );
if( !p_input )
return;
// Get playlist item information
input_item_t *pItem = input_GetItem( p_input );
char *pszName = input_item_GetName( pItem );
char *pszUri = input_item_GetURI( pItem );
string name = pszName;
// XXX: This should be done in VLC core, not here...
// Remove path information if any
OSFactory *pFactory = OSFactory::instance( getIntf() );
string::size_type pos = name.rfind( pFactory->getDirSeparator() );
if( pos != string::npos )
{
name = name.substr( pos + 1, name.size() - pos + 1 );
}
UString srcName( getIntf(), name.c_str() );
UString srcURI( getIntf(), pszUri );
free( pszName );
free( pszUri );
// Create commands to update the stream variables
CmdSetText *pCmd1 = new CmdSetText( getIntf(), m_rStreamName, srcName );
CmdSetText *pCmd2 = new CmdSetText( getIntf(), m_rStreamURI, srcURI );
// Push the commands in the asynchronous command queue
AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
pQueue->push( CmdGenericPtr( pCmd1 ), false );
pQueue->push( CmdGenericPtr( pCmd2 ), false );
vlc_object_release( p_input );
}
/*****************************************************************************
* cmd_update_item.hpp
*****************************************************************************
* Copyright (C) 2003-2009 the VideoLAN team
* $Id$
*
* Authors: Cyril Deguet <asmax@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
* 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
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.,
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef CMD_UPDATE_ITEM_HPP
#define CMD_UPDATE_ITEM_HPP
#include "cmd_generic.hpp"
#include <string>
/// Udate item command
class CmdUpdateItem: public CmdGeneric
{
public:
CmdUpdateItem( intf_thread_t *I,VarText &N,VarText &U )
: CmdGeneric(I), m_rStreamName(N), m_rStreamURI(U) { }
virtual ~CmdUpdateItem() { }
virtual void execute();
virtual string getType() const { return "update item"; }
private:
VarText &m_rStreamName;
VarText &m_rStreamURI;
};
#endif
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "../commands/cmd_resize.hpp" #include "../commands/cmd_resize.hpp"
#include "../commands/cmd_vars.hpp" #include "../commands/cmd_vars.hpp"
#include "../commands/cmd_dialogs.hpp" #include "../commands/cmd_dialogs.hpp"
#include "../commands/cmd_update_item.hpp"
#include "../commands/cmd_audio.hpp" #include "../commands/cmd_audio.hpp"
#include "../commands/cmd_callbacks.hpp" #include "../commands/cmd_callbacks.hpp"
#include "../utils/var_bool.hpp" #include "../utils/var_bool.hpp"
...@@ -363,17 +362,6 @@ int VlcProc::onInteraction( vlc_object_t *pObj, const char *pVariable, ...@@ -363,17 +362,6 @@ int VlcProc::onInteraction( vlc_object_t *pObj, const char *pVariable,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
void VlcProc::updateStreamName()
{
// Create a update item command
CmdUpdateItem *pCmdItem = new CmdUpdateItem( getIntf(), getStreamNameVar(), getStreamURIVar() );
// Push the command in the asynchronous command queue
AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
pQueue->push( CmdGenericPtr( pCmdItem ) );
}
int VlcProc::onEqBandsChange( vlc_object_t *pObj, const char *pVariable, int VlcProc::onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal, vlc_value_t oldVal, vlc_value_t newVal,
void *pParam ) void *pParam )
......
...@@ -173,9 +173,6 @@ private: ...@@ -173,9 +173,6 @@ private:
/// Define the command that calls manage() /// Define the command that calls manage()
DEFINE_CALLBACK( VlcProc, Manage ); DEFINE_CALLBACK( VlcProc, Manage );
/// Update the stream name variable
void updateStreamName();
/// Callback for intf-show variable /// Callback for intf-show variable
static int onIntfShow( vlc_object_t *pObj, const char *pVariable, static int onIntfShow( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal, vlc_value_t oldVal, vlc_value_t newVal,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment