Commit 73a94837 authored by Francois Cartegnie's avatar Francois Cartegnie

Qt: insert newlines for readability

parent d6742e01
...@@ -76,23 +76,28 @@ public: ...@@ -76,23 +76,28 @@ public:
FullscreenControlHide, FullscreenControlHide,
FullscreenControlPlanHide, FullscreenControlPlanHide,
}; };
IMEvent( event_types type, input_item_t *p_input = NULL ) IMEvent( event_types type, input_item_t *p_input = NULL )
: UniqueEvent( (QEvent::Type)(type) ) : UniqueEvent( (QEvent::Type)(type) )
{ {
if( (p_item = p_input) != NULL ) if( (p_item = p_input) != NULL )
vlc_gc_incref( p_item ); vlc_gc_incref( p_item );
} }
virtual ~IMEvent() virtual ~IMEvent()
{ {
if( p_item ) if( p_item )
vlc_gc_decref( p_item ); vlc_gc_decref( p_item );
} }
input_item_t *item() const { return p_item; }; input_item_t *item() const { return p_item; };
virtual bool equals(UniqueEvent *e) const virtual bool equals(UniqueEvent *e) const
{ {
IMEvent *ev = static_cast<IMEvent *>(e); IMEvent *ev = static_cast<IMEvent *>(e);
return ( ev->item() == p_item && ev->type() == type() ); return ( ev->item() == p_item && ev->type() == type() );
} }
private: private:
input_item_t *p_item; input_item_t *p_item;
}; };
...@@ -107,10 +112,12 @@ public: ...@@ -107,10 +112,12 @@ public:
LeafToParent, LeafToParent,
PLEmpty PLEmpty
}; };
PLEvent( PLEventTypes t, int i, int p = 0 ) PLEvent( PLEventTypes t, int i, int p = 0 )
: QEvent( (QEvent::Type)(t) ), i_item(i), i_parent(p) {} : QEvent( (QEvent::Type)(t) ), i_item(i), i_parent(p) {}
int getItemId() const { return i_item; }; int getItemId() const { return i_item; };
int getParentId() const { return i_parent; }; int getParentId() const { return i_parent; };
private: private:
/* Needed for "playlist-item*" and "leaf-to-parent" callbacks /* Needed for "playlist-item*" and "leaf-to-parent" callbacks
* !! Can be a input_item_t->i_id or a playlist_item_t->i_id */ * !! Can be a input_item_t->i_id or a playlist_item_t->i_id */
...@@ -255,6 +262,7 @@ class MainInputManager : public QObject, public Singleton<MainInputManager> ...@@ -255,6 +262,7 @@ class MainInputManager : public QObject, public Singleton<MainInputManager>
{ {
Q_OBJECT Q_OBJECT
friend class Singleton<MainInputManager>; friend class Singleton<MainInputManager>;
public: public:
input_thread_t *getInput() { return p_input; } input_thread_t *getInput() { return p_input; }
InputManager *getIM() { return im; } InputManager *getIM() { return im; }
...@@ -270,6 +278,7 @@ public: ...@@ -270,6 +278,7 @@ public:
bool hasEmptyPlaylist(); bool hasEmptyPlaylist();
void requestVoutUpdate() { return im->UpdateVout(); } void requestVoutUpdate() { return im->UpdateVout(); }
private: private:
MainInputManager( intf_thread_t * ); MainInputManager( intf_thread_t * );
virtual ~MainInputManager(); virtual ~MainInputManager();
...@@ -295,11 +304,13 @@ public slots: ...@@ -295,11 +304,13 @@ public slots:
void activatePlayQuit( bool ); void activatePlayQuit( bool );
void loopRepeatLoopStatus(); void loopRepeatLoopStatus();
private slots: private slots:
void notifyRandom( bool ); void notifyRandom( bool );
void notifyRepeatLoop( bool ); void notifyRepeatLoop( bool );
void notifyVolume( float ); void notifyVolume( float );
void notifyMute( bool ); void notifyMute( bool );
signals: signals:
void inputChanged( input_thread_t * ); void inputChanged( input_thread_t * );
void volumeChanged( float ); void volumeChanged( float );
......
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