Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
b7513df5
Commit
b7513df5
authored
Feb 02, 2008
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Capture devices interface changes: put v4l2 before v4l. Put the advanced settings in a scroll area.
parent
ae87215a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
47 additions
and
42 deletions
+47
-42
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+47
-42
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
b7513df5
...
...
@@ -630,6 +630,41 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
}
#else
/* WIN32 */
/*******
* V4L2*
*******/
if
(
module_Exists
(
p_intf
,
"v4l2"
)
){
addModuleAndLayouts
(
V4L2_DEVICE
,
v4l2
,
"Video for Linux 2"
);
/* V4l Main panel */
QLabel
*
v4l2VideoDeviceLabel
=
new
QLabel
(
qtr
(
"Video device name"
)
);
v4l2DevLayout
->
addWidget
(
v4l2VideoDeviceLabel
,
0
,
0
);
v4l2VideoDevice
=
new
QLineEdit
;
v4l2DevLayout
->
addWidget
(
v4l2VideoDevice
,
0
,
1
);
QLabel
*
v4l2AudioDeviceLabel
=
new
QLabel
(
qtr
(
"Audio device name"
)
);
v4l2DevLayout
->
addWidget
(
v4l2AudioDeviceLabel
,
1
,
0
);
v4l2AudioDevice
=
new
QLineEdit
;
v4l2DevLayout
->
addWidget
(
v4l2AudioDevice
,
1
,
1
);
/* v4l2 Props panel */
QLabel
*
v4l2StdLabel
=
new
QLabel
(
qtr
(
"Standard"
)
);
v4l2PropLayout
->
addWidget
(
v4l2StdLabel
,
0
,
0
);
v4l2StdBox
=
new
QComboBox
;
setfillVLCConfigCombo
(
"v4l2-standard"
,
p_intf
,
v4l2StdBox
);
v4l2PropLayout
->
addWidget
(
v4l2StdBox
,
0
,
1
);
v4l2PropLayout
->
addItem
(
new
QSpacerItem
(
20
,
20
,
QSizePolicy
::
Expanding
),
1
,
0
,
3
,
1
);
/* v4l2 CONNECTs */
CuMRL
(
v4l2VideoDevice
,
textChanged
(
QString
)
);
CuMRL
(
v4l2AudioDevice
,
textChanged
(
QString
)
);
CuMRL
(
v4l2StdBox
,
currentIndexChanged
(
int
)
);
}
/*******
* V4L *
*******/
...
...
@@ -675,41 +710,6 @@ CaptureOpenPanel::CaptureOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CuMRL
(
v4lNormBox
,
currentIndexChanged
(
int
)
);
}
/*******
* V4L2*
*******/
if
(
module_Exists
(
p_intf
,
"v4l2"
)
){
addModuleAndLayouts
(
V4L2_DEVICE
,
v4l2
,
"Video for Linux 2"
);
/* V4l Main panel */
QLabel
*
v4l2VideoDeviceLabel
=
new
QLabel
(
qtr
(
"Video device name"
)
);
v4l2DevLayout
->
addWidget
(
v4l2VideoDeviceLabel
,
0
,
0
);
v4l2VideoDevice
=
new
QLineEdit
;
v4l2DevLayout
->
addWidget
(
v4l2VideoDevice
,
0
,
1
);
QLabel
*
v4l2AudioDeviceLabel
=
new
QLabel
(
qtr
(
"Audio device name"
)
);
v4l2DevLayout
->
addWidget
(
v4l2AudioDeviceLabel
,
1
,
0
);
v4l2AudioDevice
=
new
QLineEdit
;
v4l2DevLayout
->
addWidget
(
v4l2AudioDevice
,
1
,
1
);
/* v4l2 Props panel */
QLabel
*
v4l2StdLabel
=
new
QLabel
(
qtr
(
"Standard"
)
);
v4l2PropLayout
->
addWidget
(
v4l2StdLabel
,
0
,
0
);
v4l2StdBox
=
new
QComboBox
;
setfillVLCConfigCombo
(
"v4l2-standard"
,
p_intf
,
v4l2StdBox
);
v4l2PropLayout
->
addWidget
(
v4l2StdBox
,
0
,
1
);
v4l2PropLayout
->
addItem
(
new
QSpacerItem
(
20
,
20
,
QSizePolicy
::
Expanding
),
1
,
0
,
3
,
1
);
/* v4l2 CONNECTs */
CuMRL
(
v4l2VideoDevice
,
textChanged
(
QString
)
);
CuMRL
(
v4l2AudioDevice
,
textChanged
(
QString
)
);
CuMRL
(
v4l2StdBox
,
currentIndexChanged
(
int
)
);
}
/*******
* JACK *
*******/
...
...
@@ -1068,12 +1068,17 @@ void CaptureOpenPanel::advancedDialog()
/* A main Layout with a Frame */
QVBoxLayout
*
mainLayout
=
new
QVBoxLayout
(
adv
);
//TODO QScrollArea
QFrame
*
advFrame
=
new
QFrame
;
mainLayout
->
addWidget
(
advFrame
);
QScrollArea
*
scroll
=
new
QScrollArea
;
mainLayout
->
addWidget
(
scroll
);
/* GridLayout inside the Frame */
QGridLayout
*
gLayout
=
new
QGridLayout
(
advFrame
);
gLayout
->
setSizeConstraint
(
QLayout
::
SetFixedSize
);
scroll
->
setHorizontalScrollBarPolicy
(
Qt
::
ScrollBarAlwaysOff
);
scroll
->
setWidgetResizable
(
true
);
scroll
->
setWidget
(
advFrame
);
/* Create the options inside the FrameLayout */
for
(
int
n
=
0
;
n
<
i_confsize
;
n
++
)
...
...
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