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
601609fe
Commit
601609fe
authored
Mar 27, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: handle multiple Linux DVB frontends per adapter
parent
b17181d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+12
-1
modules/gui/qt4/components/open_panels.hpp
modules/gui/qt4/components/open_panels.hpp
+1
-1
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
601609fe
...
@@ -942,9 +942,14 @@ void CaptureOpenPanel::initialize()
...
@@ -942,9 +942,14 @@ void CaptureOpenPanel::initialize()
dvbCard
->
setAlignment
(
Qt
::
AlignRight
);
dvbCard
->
setAlignment
(
Qt
::
AlignRight
);
#ifdef __linux__
#ifdef __linux__
dvbCard
->
setPrefix
(
"/dev/dvb/adapter"
);
dvbCard
->
setPrefix
(
"/dev/dvb/adapter"
);
dvbFE
=
new
QSpinBox
;
dvbFE
->
setPrefix
(
"/frontend"
);
#endif
#endif
dvbDevLayout
->
addWidget
(
dvbDeviceLabel
,
0
,
0
);
dvbDevLayout
->
addWidget
(
dvbDeviceLabel
,
0
,
0
);
dvbDevLayout
->
addWidget
(
dvbCard
,
0
,
2
,
1
,
2
);
dvbDevLayout
->
addWidget
(
dvbCard
,
0
,
1
,
1
,
2
);
#ifdef __linux__
dvbDevLayout
->
addWidget
(
dvbFE
,
0
,
3
);
#endif
dvbc
=
new
QRadioButton
(
"DVB-C"
);
dvbc
=
new
QRadioButton
(
"DVB-C"
);
dvbs
=
new
QRadioButton
(
"DVB-S"
);
dvbs
=
new
QRadioButton
(
"DVB-S"
);
...
@@ -1011,6 +1016,9 @@ void CaptureOpenPanel::initialize()
...
@@ -1011,6 +1016,9 @@ void CaptureOpenPanel::initialize()
/* DVB CONNECTs */
/* DVB CONNECTs */
CuMRL
(
dvbCard
,
valueChanged
(
int
)
);
CuMRL
(
dvbCard
,
valueChanged
(
int
)
);
#ifdef __linux__
CuMRL
(
dvbFE
,
valueChanged
(
int
)
);
#endif
CuMRL
(
dvbFreq
,
valueChanged
(
int
)
);
CuMRL
(
dvbFreq
,
valueChanged
(
int
)
);
CuMRL
(
dvbSrate
,
valueChanged
(
int
)
);
CuMRL
(
dvbSrate
,
valueChanged
(
int
)
);
CuMRL
(
dvbQamBox
,
currentIndexChanged
(
int
)
);
CuMRL
(
dvbQamBox
,
currentIndexChanged
(
int
)
);
...
@@ -1155,6 +1163,9 @@ void CaptureOpenPanel::updateMRL()
...
@@ -1155,6 +1163,9 @@ void CaptureOpenPanel::updateMRL()
fileList
<<
mrl
;
mrl
=
""
;
fileList
<<
mrl
;
mrl
=
""
;
mrl
+=
" :dvb-adapter="
+
QString
::
number
(
dvbCard
->
value
()
);
mrl
+=
" :dvb-adapter="
+
QString
::
number
(
dvbCard
->
value
()
);
#ifdef __linux__
mrl
+=
" :dvb-device="
+
QString
::
number
(
dvbFE
->
value
()
);
#endif
break
;
break
;
case
SCREEN_DEVICE
:
case
SCREEN_DEVICE
:
fileList
<<
"screen://"
;
fileList
<<
"screen://"
;
...
...
modules/gui/qt4/components/open_panels.hpp
View file @
601609fe
...
@@ -216,7 +216,7 @@ private:
...
@@ -216,7 +216,7 @@ private:
QRadioButton
*
dvbs
,
*
dvbt
,
*
dvbc
,
*
atsc
,
*
cqam
;
QRadioButton
*
dvbs
,
*
dvbt
,
*
dvbc
,
*
atsc
,
*
cqam
;
QLabel
*
dvbBandLabel
,
*
dvbSrateLabel
,
*
dvbModLabel
;
QLabel
*
dvbBandLabel
,
*
dvbSrateLabel
,
*
dvbModLabel
;
QComboBox
*
dvbQamBox
,
*
dvbBandBox
;
QComboBox
*
dvbQamBox
,
*
dvbBandBox
;
QSpinBox
*
dvbCard
,
*
dvbFreq
,
*
dvbSrate
;
QSpinBox
*
dvbCard
,
*
dvbF
E
,
*
dvbF
req
,
*
dvbSrate
;
QDoubleSpinBox
*
screenFPS
;
QDoubleSpinBox
*
screenFPS
;
public
slots
:
public
slots
:
...
...
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