Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
31da28cd
Commit
31da28cd
authored
Aug 22, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix demuxdump MRL generation in Sout (Qt part of #1853 )
parent
e8804a3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
5 deletions
+32
-5
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+21
-2
modules/gui/qt4/ui/sout.ui
modules/gui/qt4/ui/sout.ui
+11
-3
No files found.
modules/gui/qt4/dialogs/sout.cpp
View file @
31da28cd
...
...
@@ -241,10 +241,18 @@ void SoutDialog::setSTranscodeOptions( bool b_trans )
void
SoutDialog
::
setRawOptions
(
bool
b_raw
)
{
ui
.
localOutput
->
setEnabled
(
!
b_raw
);
ui
.
HTTPOutput
->
setEnabled
(
!
b_raw
);
ui
.
MMSHOutput
->
setEnabled
(
!
b_raw
);
ui
.
UDPOutput
->
setEnabled
(
!
b_raw
);
ui
.
RTPOutput
->
setEnabled
(
!
b_raw
);
ui
.
IcecastOutput
->
setEnabled
(
!
b_raw
);
ui
.
UDPRTPLabel
->
setEnabled
(
!
b_raw
);
if
(
b_raw
)
ui
.
tabWidget
->
setDisabled
(
true
);
else
SoutDialog
::
setOptions
();
setOptions
();
}
void
SoutDialog
::
setOptions
()
...
...
@@ -373,6 +381,7 @@ void SoutDialog::updateMRL()
sout
.
b_icecast
=
ui
.
IcecastOutput
->
isChecked
();
sout
.
b_rtp
=
ui
.
RTPOutput
->
isChecked
();
sout
.
b_udp
=
ui
.
UDPOutput
->
isChecked
();
sout
.
b_dump
=
ui
.
rawInput
->
isChecked
();
sout
.
b_sap
=
ui
.
sap
->
isChecked
();
sout
.
b_all_es
=
ui
.
soutAll
->
isChecked
();
sout
.
psz_vcodec
=
strdup
(
qtu
(
ui
.
vCodecBox
->
itemData
(
ui
.
vCodecBox
->
currentIndex
()
).
toString
()
)
);
...
...
@@ -424,7 +433,8 @@ void SoutDialog::updateMRL()
bool
trans
=
false
;
bool
more
=
false
;
if
(
ui
.
transcodeVideo
->
isChecked
()
||
ui
.
transcodeAudio
->
isChecked
()
)
if
(
ui
.
transcodeVideo
->
isChecked
()
||
ui
.
transcodeAudio
->
isChecked
()
&&
!
ui
.
rawInput
->
isChecked
()
/*demuxdump speciality*/
)
{
if
(
ui
.
transcodeVideo
->
isChecked
()
)
{
...
...
@@ -463,6 +473,15 @@ void SoutDialog::updateMRL()
mrl
.
append
(
"}"
);
}
/* Special case for demuxdump */
if
(
sout
.
b_file
&&
sout
.
b_dump
)
{
mrl
=
":demux=dump :demuxdump-file="
;
mrl
.
append
(
sout
.
psz_file
);
}
else
/* Protocol output */
if
(
sout
.
b_local
||
sout
.
b_file
||
sout
.
b_http
||
sout
.
b_mms
||
sout
.
b_rtp
||
sout
.
b_udp
||
sout
.
b_icecast
)
...
...
modules/gui/qt4/ui/sout.ui
View file @
31da28cd
...
...
@@ -284,7 +284,7 @@
<item row="5" column="4" >
<widget class="QLineEdit" name="UDPEdit" >
<property name="enabled" >
<bool>
tru
e</bool>
<bool>
fals
e</bool>
</property>
</widget>
</item>
...
...
@@ -385,7 +385,11 @@
</widget>
</item>
<item row="7" column="4" >
<widget class="QLineEdit" name="IcecastEdit" />
<widget class="QLineEdit" name="IcecastEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="7" column="5" >
<widget class="QLabel" name="IcecastPortLabel" >
...
...
@@ -433,7 +437,11 @@
</widget>
</item>
<item row="8" column="4" >
<widget class="QLineEdit" name="IcecastMountpointEdit" />
<widget class="QLineEdit" name="IcecastMountpointEdit" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="8" column="5" >
<widget class="QLabel" name="IcecastNameLabel" >
...
...
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