Commit 9ce2d2e0 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

input_manager: Don't use THEMIM macro from input_manager

Store it internally instead. There's a 1:1 relation between the 2
instances.
Fix #16866
parent 35a51c65
...@@ -62,9 +62,10 @@ static inline void registerAndCheckEventIds( int start, int end ) ...@@ -62,9 +62,10 @@ static inline void registerAndCheckEventIds( int start, int end )
* But can also be used for VLM dialog or similar * But can also be used for VLM dialog or similar
**********************************************************************/ **********************************************************************/
InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) : InputManager::InputManager( MainInputManager *mim, intf_thread_t *_p_intf) :
QObject( parent ), p_intf( _p_intf ) QObject( mim ), p_intf( _p_intf )
{ {
p_mim = mim;
i_old_playing_status = END_S; i_old_playing_status = END_S;
oldName = ""; oldName = "";
artUrl = ""; artUrl = "";
...@@ -87,7 +88,7 @@ InputManager::~InputManager() ...@@ -87,7 +88,7 @@ InputManager::~InputManager()
void InputManager::inputChangedHandler() void InputManager::inputChangedHandler()
{ {
setInput( THEMIM->getInput() ); setInput( p_mim->getInput() );
} }
/* Define the Input used. /* Define the Input used.
...@@ -731,7 +732,7 @@ void InputManager::setArt( input_item_t *p_item, QString fileUrl ) ...@@ -731,7 +732,7 @@ void InputManager::setArt( input_item_t *p_item, QString fileUrl )
if( hasInput() ) if( hasInput() )
{ {
char *psz_cachedir = config_GetUserDir( VLC_CACHE_DIR ); char *psz_cachedir = config_GetUserDir( VLC_CACHE_DIR );
QString old_url = THEMIM->getIM()->decodeArtURL( p_item ); QString old_url = p_mim->getIM()->decodeArtURL( p_item );
old_url = QDir( old_url ).canonicalPath(); old_url = QDir( old_url ).canonicalPath();
if( old_url.startsWith( QString::fromUtf8( psz_cachedir ) ) ) if( old_url.startsWith( QString::fromUtf8( psz_cachedir ) ) )
...@@ -945,12 +946,12 @@ void InputManager::setAtoB() ...@@ -945,12 +946,12 @@ void InputManager::setAtoB()
{ {
if( !timeA ) if( !timeA )
{ {
timeA = var_GetInteger( THEMIM->getInput(), "time" ); timeA = var_GetInteger( p_mim->getInput(), "time" );
} }
else if( !timeB ) else if( !timeB )
{ {
timeB = var_GetInteger( THEMIM->getInput(), "time" ); timeB = var_GetInteger( p_mim->getInput(), "time" );
var_SetInteger( THEMIM->getInput(), "time" , timeA ); var_SetInteger( p_mim->getInput(), "time" , timeA );
CONNECT( this, positionUpdated( float, int64_t, int ), CONNECT( this, positionUpdated( float, int64_t, int ),
this, AtoBLoop( float, int64_t, int ) ); this, AtoBLoop( float, int64_t, int ) );
} }
...@@ -968,7 +969,7 @@ void InputManager::setAtoB() ...@@ -968,7 +969,7 @@ void InputManager::setAtoB()
void InputManager::AtoBLoop( float, int64_t i_time, int ) void InputManager::AtoBLoop( float, int64_t i_time, int )
{ {
if( timeB && i_time >= timeB ) if( timeB && i_time >= timeB )
var_SetInteger( THEMIM->getInput(), "time" , timeA ); var_SetInteger( p_mim->getInput(), "time" , timeA );
} }
/********************************************************************** /**********************************************************************
......
...@@ -120,13 +120,15 @@ private: ...@@ -120,13 +120,15 @@ private:
int i_parent; int i_parent;
}; };
class MainInputManager;
class InputManager : public QObject class InputManager : public QObject
{ {
Q_OBJECT Q_OBJECT
friend class MainInputManager; friend class MainInputManager;
public: public:
InputManager( QObject *, intf_thread_t * ); InputManager( MainInputManager *, intf_thread_t * );
virtual ~InputManager(); virtual ~InputManager();
void delInput(); void delInput();
...@@ -144,6 +146,7 @@ public: ...@@ -144,6 +146,7 @@ public:
private: private:
intf_thread_t *p_intf; intf_thread_t *p_intf;
MainInputManager* p_mim;
input_thread_t *p_input; input_thread_t *p_input;
vlc_object_t *p_input_vbi; vlc_object_t *p_input_vbi;
input_item_t *p_item; input_item_t *p_item;
......
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