Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fdb50775
Commit
fdb50775
authored
Jul 19, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: use qlonglong instead of int64_t for cross-thread connections
int64_t is not supported natively by the Qt object system.
parent
b2e47841
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+2
-2
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+1
-1
modules/gui/qt4/variables.cpp
modules/gui/qt4/variables.cpp
+2
-1
modules/gui/qt4/variables.hpp
modules/gui/qt4/variables.hpp
+1
-1
No files found.
modules/gui/qt4/input_manager.cpp
View file @
fdb50775
...
...
@@ -958,7 +958,7 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
repeat
.
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
))
);
/* Warn our embedded IM about input changes */
...
...
@@ -1217,7 +1217,7 @@ static int LeafToParent( vlc_object_t *p_this, const char *psz_var,
return
VLC_SUCCESS
;
}
void
MainInputManager
::
notifyVolume
(
int64_t
volume
)
void
MainInputManager
::
notifyVolume
(
qlonglong
volume
)
{
emit
volumeChanged
(
volume
/
(
float
)
AOUT_VOLUME_DEFAULT
);
}
...
...
modules/gui/qt4/input_manager.hpp
View file @
fdb50775
...
...
@@ -292,7 +292,7 @@ public slots:
private
slots
:
void
notifyRandom
(
bool
);
void
notifyRepeatLoop
(
bool
);
void
notifyVolume
(
int64_t
);
void
notifyVolume
(
qlonglong
);
void
notifyMute
(
bool
);
signals:
void
inputChanged
(
input_thread_t
*
);
...
...
modules/gui/qt4/variables.cpp
View file @
fdb50775
...
...
@@ -86,7 +86,8 @@ void QVLCInteger::trigger (vlc_value_t, vlc_value_t cur)
bool
QVLCInteger
::
addCallback
(
QObject
*
tgt
,
const
char
*
method
,
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
)
...
...
modules/gui/qt4/variables.hpp
View file @
fdb50775
...
...
@@ -70,7 +70,7 @@ public:
Qt
::
ConnectionType
type
=
Qt
::
AutoConnection
);
signals:
void
integerChanged
(
int64_t
);
void
integerChanged
(
qlonglong
);
};
class
QVLCBool
:
public
QVLCVariable
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment