Commit fdb50775 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: use qlonglong instead of int64_t for cross-thread connections

int64_t is not supported natively by the Qt object system.
parent b2e47841
...@@ -958,7 +958,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) ...@@ -958,7 +958,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); repeat.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) ); loop.addCallback( this, SLOT(notifyRepeatLoop(bool)) );
volume.addCallback( this, SLOT(notifyVolume(int64_t)) ); volume.addCallback( this, SLOT(notifyVolume(qlonglong)) );
mute.addCallback( this, SLOT(notifyMute(bool)) ); mute.addCallback( this, SLOT(notifyMute(bool)) );
/* Warn our embedded IM about input changes */ /* Warn our embedded IM about input changes */
...@@ -1217,7 +1217,7 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var, ...@@ -1217,7 +1217,7 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
void MainInputManager::notifyVolume( int64_t volume ) void MainInputManager::notifyVolume( qlonglong volume )
{ {
emit volumeChanged( volume / (float)AOUT_VOLUME_DEFAULT ); emit volumeChanged( volume / (float)AOUT_VOLUME_DEFAULT );
} }
......
...@@ -292,7 +292,7 @@ public slots: ...@@ -292,7 +292,7 @@ public slots:
private slots: private slots:
void notifyRandom( bool ); void notifyRandom( bool );
void notifyRepeatLoop( bool ); void notifyRepeatLoop( bool );
void notifyVolume( int64_t ); void notifyVolume( qlonglong );
void notifyMute( bool ); void notifyMute( bool );
signals: signals:
void inputChanged( input_thread_t * ); void inputChanged( input_thread_t * );
......
...@@ -86,7 +86,8 @@ void QVLCInteger::trigger (vlc_value_t, vlc_value_t cur) ...@@ -86,7 +86,8 @@ void QVLCInteger::trigger (vlc_value_t, vlc_value_t cur)
bool QVLCInteger::addCallback (QObject *tgt, const char *method, bool QVLCInteger::addCallback (QObject *tgt, const char *method,
Qt::ConnectionType type) Qt::ConnectionType type)
{ {
return tgt->connect (this, SIGNAL(integerChanged(int64_t)), method, type); return tgt->connect (this, SIGNAL(integerChanged(qlonglong)), method,
type);
} }
QVLCBool::QVLCBool (vlc_object_t *obj, const char *varname, bool inherit) QVLCBool::QVLCBool (vlc_object_t *obj, const char *varname, bool inherit)
......
...@@ -70,7 +70,7 @@ public: ...@@ -70,7 +70,7 @@ public:
Qt::ConnectionType type = Qt::AutoConnection); Qt::ConnectionType type = Qt::AutoConnection);
signals: signals:
void integerChanged (int64_t); void integerChanged (qlonglong);
}; };
class QVLCBool : public QVLCVariable class QVLCBool : public QVLCVariable
......
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