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
6e6dd550
Commit
6e6dd550
authored
Mar 15, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: move Sout Dialog out of singleton.
parent
db8ce6ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
19 deletions
+3
-19
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+0
-2
modules/gui/qt4/dialogs/sout.hpp
modules/gui/qt4/dialogs/sout.hpp
+1
-15
modules/gui/qt4/dialogs/vlm.cpp
modules/gui/qt4/dialogs/vlm.cpp
+1
-1
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+1
-1
No files found.
modules/gui/qt4/dialogs/sout.cpp
View file @
6e6dd550
...
@@ -35,8 +35,6 @@
...
@@ -35,8 +35,6 @@
#include <QFileDialog>
#include <QFileDialog>
#include <QToolButton>
#include <QToolButton>
SoutDialog
*
SoutDialog
::
instance
=
NULL
;
SoutDialog
::
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
,
QString
inputMRL
)
SoutDialog
::
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
,
QString
inputMRL
)
:
QVLCDialog
(
parent
,
_p_intf
)
:
QVLCDialog
(
parent
,
_p_intf
)
{
{
...
...
modules/gui/qt4/dialogs/sout.hpp
View file @
6e6dd550
...
@@ -113,27 +113,13 @@ class SoutDialog : public QVLCDialog
...
@@ -113,27 +113,13 @@ class SoutDialog : public QVLCDialog
{
{
Q_OBJECT
;
Q_OBJECT
;
public:
public:
static
SoutDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
QString
mrl
=
""
);
QString
mrl
=
""
)
{
if
(
!
instance
)
instance
=
new
SoutDialog
(
parent
,
p_intf
,
mrl
);
else
{
/* Recenter the dialog on the parent */
instance
->
setParent
(
parent
,
Qt
::
Dialog
);
}
return
instance
;
}
virtual
~
SoutDialog
(){}
virtual
~
SoutDialog
(){}
QString
getMrl
(){
return
mrl
;
}
QString
getMrl
(){
return
mrl
;
}
private:
private:
Ui
::
Sout
ui
;
Ui
::
Sout
ui
;
static
SoutDialog
*
instance
;
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
QString
mrl
);
QString
mrl
;
QString
mrl
;
QPushButton
*
okButton
;
QPushButton
*
okButton
;
...
...
modules/gui/qt4/dialogs/vlm.cpp
View file @
6e6dd550
...
@@ -399,7 +399,7 @@ void VLMDialog::selectInput()
...
@@ -399,7 +399,7 @@ void VLMDialog::selectInput()
void
VLMDialog
::
selectOutput
()
void
VLMDialog
::
selectOutput
()
{
{
SoutDialog
*
s
=
SoutDialog
::
getInstance
(
this
,
p_intf
);
SoutDialog
*
s
=
new
SoutDialog
(
this
,
p_intf
);
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
ui
.
outputLedit
->
setText
(
s
->
getMrl
()
);
ui
.
outputLedit
->
setText
(
s
->
getMrl
()
);
}
}
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
6e6dd550
...
@@ -576,7 +576,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
...
@@ -576,7 +576,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
/* Stream */
/* Stream */
if
(
!
b_transcode_only
)
if
(
!
b_transcode_only
)
{
{
SoutDialog
*
s
=
SoutDialog
::
getInstance
(
parent
,
p_intf
,
mrl
);
SoutDialog
*
s
=
new
SoutDialog
(
parent
,
p_intf
,
mrl
);
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
{
{
psz_soutoption
=
strdup
(
qtu
(
s
->
getMrl
()
)
);
psz_soutoption
=
strdup
(
qtu
(
s
->
getMrl
()
)
);
...
...
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