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
5a6c9e94
Commit
5a6c9e94
authored
Mar 29, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start of the work for the audio/video/subs synchronisation
parent
bf1292e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
93 additions
and
2 deletions
+93
-2
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+78
-1
modules/gui/qt4/components/extended_panels.hpp
modules/gui/qt4/components/extended_panels.hpp
+12
-0
modules/gui/qt4/dialogs/extended.cpp
modules/gui/qt4/dialogs/extended.cpp
+3
-1
No files found.
modules/gui/qt4/components/extended_panels.cpp
View file @
5a6c9e94
/*****************************************************************************
/*****************************************************************************
* extended_panels.cpp : Extended controls panels
* extended_panels.cpp : Extended controls panels
****************************************************************************
****************************************************************************
* Copyright (
C
) 2006-2007 the VideoLAN team
* Copyright (
C
) 2006-2007 the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Clément Stenac <zorglub@videolan.org>
...
@@ -1157,6 +1157,83 @@ void Spatializer::addCallbacks( aout_instance_t *p_aout )
...
@@ -1157,6 +1157,83 @@ void Spatializer::addCallbacks( aout_instance_t *p_aout )
// var_AddCallback( p_aout, "Spatializer-preamp", EqzCallback, this );
// var_AddCallback( p_aout, "Spatializer-preamp", EqzCallback, this );
}
}
#include <QToolButton>
#include <QGridLayout>
SyncControls
::
SyncControls
(
intf_thread_t
*
_p_intf
,
QWidget
*
_parent
)
:
QWidget
(
_parent
)
,
p_intf
(
_p_intf
)
{
QGroupBox
*
AVBox
,
*
subsBox
;
QToolButton
*
moinsAV
,
*
plusAV
;
QToolButton
*
moinssubs
,
*
plussubs
;
QVBoxLayout
*
vboxLayout
=
new
QVBoxLayout
(
this
);
AVBox
=
new
QGroupBox
(
qtr
(
"Audio/Video"
)
);
QGridLayout
*
gridLayout
=
new
QGridLayout
(
AVBox
);
moinsAV
=
new
QToolButton
;
moinsAV
->
setToolButtonStyle
(
Qt
::
ToolButtonTextOnly
);
moinsAV
->
setAutoRaise
(
true
);
moinsAV
->
setText
(
"-"
);
gridLayout
->
addWidget
(
moinsAV
,
1
,
0
,
1
,
1
);
plusAV
=
new
QToolButton
;
plusAV
->
setToolButtonStyle
(
Qt
::
ToolButtonTextOnly
);
plusAV
->
setAutoRaise
(
true
);
plusAV
->
setText
(
"+"
);
gridLayout
->
addWidget
(
plusAV
,
1
,
2
,
1
,
1
);
QLabel
*
AVLabel
=
new
QLabel
;
AVLabel
->
setText
(
qtr
(
"Advance of audio over video"
)
);
gridLayout
->
addWidget
(
AVLabel
,
0
,
0
,
1
,
3
);
AVSpin
=
new
QDoubleSpinBox
;
AVSpin
->
setAlignment
(
Qt
::
AlignRight
|
Qt
::
AlignTrailing
|
Qt
::
AlignVCenter
);
AVSpin
->
setDecimals
(
3
);
AVSpin
->
setMinimum
(
-
100
);
AVSpin
->
setMaximum
(
100
);
AVSpin
->
setSingleStep
(
0.1
);
AVSpin
->
setToolTip
(
qtr
(
"A positive value means that
\n
"
"the audio is ahead of the video"
)
);
AVSpin
->
setSuffix
(
"ms"
);
gridLayout
->
addWidget
(
AVSpin
,
1
,
1
,
1
,
1
);
vboxLayout
->
addWidget
(
AVBox
);
subsBox
=
new
QGroupBox
(
qtr
(
"Subtitles/Video"
)
);
QGridLayout
*
subsLayout
=
new
QGridLayout
(
subsBox
);
moinssubs
=
new
QToolButton
;
moinssubs
->
setToolButtonStyle
(
Qt
::
ToolButtonTextOnly
);
moinssubs
->
setAutoRaise
(
true
);
moinssubs
->
setText
(
"-"
);
subsLayout
->
addWidget
(
moinssubs
,
1
,
0
,
1
,
1
);
plussubs
=
new
QToolButton
;
plussubs
->
setToolButtonStyle
(
Qt
::
ToolButtonTextOnly
);
plussubs
->
setAutoRaise
(
true
);
plussubs
->
setText
(
"+"
);
subsLayout
->
addWidget
(
plussubs
,
1
,
2
,
1
,
1
);
QLabel
*
subsLabel
=
new
QLabel
;
subsLabel
->
setText
(
qtr
(
"Advance of subtitles over video"
)
);
subsLayout
->
addWidget
(
subsLabel
,
0
,
0
,
1
,
3
);
subsSpin
=
new
QDoubleSpinBox
;
subsSpin
->
setAlignment
(
Qt
::
AlignRight
|
Qt
::
AlignTrailing
|
Qt
::
AlignVCenter
);
subsSpin
->
setDecimals
(
3
);
subsSpin
->
setMinimum
(
-
100
);
subsSpin
->
setMaximum
(
100
);
subsSpin
->
setSingleStep
(
0.1
);
subsSpin
->
setToolTip
(
qtr
(
"A positive value means that
\n
"
"the subtitles are ahead of the video"
)
);
subsSpin
->
setSuffix
(
"ms"
);
subsLayout
->
addWidget
(
subsSpin
,
1
,
1
,
1
,
1
);
vboxLayout
->
addWidget
(
subsBox
);
}
/**********************************************************************
/**********************************************************************
* Video filters / Adjust
* Video filters / Adjust
**********************************************************************/
**********************************************************************/
...
...
modules/gui/qt4/components/extended_panels.hpp
View file @
5a6c9e94
...
@@ -150,4 +150,16 @@ private slots:
...
@@ -150,4 +150,16 @@ private slots:
void
snapshot
()
{};
void
snapshot
()
{};
};
};
class
SyncControls
:
public
QWidget
{
Q_OBJECT
public:
SyncControls
(
intf_thread_t
*
,
QWidget
*
);
virtual
~
SyncControls
()
{};
private:
intf_thread_t
*
p_intf
;
QDoubleSpinBox
*
AVSpin
;
QDoubleSpinBox
*
subsSpin
;
};
#endif
#endif
modules/gui/qt4/dialogs/extended.cpp
View file @
5a6c9e94
...
@@ -43,7 +43,6 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
...
@@ -43,7 +43,6 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
QGridLayout
*
layout
=
new
QGridLayout
(
this
);
QGridLayout
*
layout
=
new
QGridLayout
(
this
);
QTabWidget
*
mainTabW
=
new
QTabWidget
(
this
);
QTabWidget
*
mainTabW
=
new
QTabWidget
(
this
);
mainTabW
->
setTabPosition
(
QTabWidget
::
West
);
/* AUDIO effects */
/* AUDIO effects */
QWidget
*
audioWidget
=
new
QWidget
;
QWidget
*
audioWidget
=
new
QWidget
;
...
@@ -70,6 +69,9 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
...
@@ -70,6 +69,9 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
mainTabW
->
addTab
(
videoWidget
,
qtr
(
"Video Effects"
)
);
mainTabW
->
addTab
(
videoWidget
,
qtr
(
"Video Effects"
)
);
SyncControls
*
syncW
=
new
SyncControls
(
p_intf
,
videoTab
);
mainTabW
->
addTab
(
syncW
,
qtr
(
"A/V Synchronisation"
)
);
if
(
module_Exists
(
p_intf
,
"v4l2"
)
)
if
(
module_Exists
(
p_intf
,
"v4l2"
)
)
{
{
ExtV4l2
*
v4l2
=
new
ExtV4l2
(
p_intf
,
mainTabW
);
ExtV4l2
*
v4l2
=
new
ExtV4l2
(
p_intf
,
mainTabW
);
...
...
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