From 279777bf17544e064bc64fab132b95fcf7fb3aa2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 16 May 2009 20:27:21 +0300 Subject: [PATCH] Qt4: keep input item rather than ID in the manager --- modules/gui/qt4/input_manager.cpp | 10 +++++----- modules/gui/qt4/input_manager.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index e26acf1939..54c83dcd9e 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -62,7 +62,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : artUrl = ""; p_input = NULL; i_rate = 0; - i_input_id = 0; + p_item = NULL; b_video = false; timeA = 0; timeB = 0; @@ -92,12 +92,12 @@ void InputManager::setInput( input_thread_t *_p_input ) UpdateNavigation(); UpdateVout(); addCallbacks(); - i_input_id = input_GetItem( p_input )->i_id; + p_item = input_GetItem( p_input ); } else { p_input = NULL; - i_input_id = 0; + p_item = NULL; emit rateChanged( INPUT_RATE_DEFAULT ); } } @@ -112,7 +112,7 @@ void InputManager::delInput() delCallbacks(); i_old_playing_status = END_S; - i_input_id = 0; + p_item = NULL; oldName = ""; artUrl = ""; b_video = false; @@ -170,7 +170,7 @@ void InputManager::customEvent( QEvent *event ) break; case ItemChanged_Type: /* Ignore ItemChanged_Type event that does not apply to our input */ - if( i_input_id == ple->i_id ) + if( p_item->i_id == ple->i_id ) { UpdateStatus(); // UpdateName(); diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp index d9b6630b28..fdc7256a4e 100644 --- a/modules/gui/qt4/input_manager.hpp +++ b/modules/gui/qt4/input_manager.hpp @@ -106,7 +106,7 @@ public: private: intf_thread_t *p_intf; input_thread_t *p_input; - int i_input_id; + input_item_t *p_item; int i_old_playing_status; QString oldName; QString artUrl; -- 2.20.1