Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
6db8acaa
Commit
6db8acaa
authored
Dec 22, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Fix previous commit.
parent
b3819c32
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+2
-1
modules/gui/qt4/dialogs/sout.hpp
modules/gui/qt4/dialogs/sout.hpp
+6
-8
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+0
-1
No files found.
modules/gui/qt4/dialogs/sout.cpp
View file @
6db8acaa
...
...
@@ -30,10 +30,11 @@
#include "dialogs/sout.hpp"
#include <vlc_streaming.h>
#include <iostream>
#include <QString>
#include <QFileDialog>
SoutDialog
*
SoutDialog
::
instance
=
NULL
;
SoutDialog
::
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
,
bool
_transcode_only
)
:
QVLCDialog
(
parent
,
_p_intf
)
{
...
...
modules/gui/qt4/dialogs/sout.hpp
View file @
6db8acaa
...
...
@@ -39,8 +39,7 @@ class SoutDialog : public QVLCDialog
{
Q_OBJECT
;
public:
static
SoutDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
static
SoutDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
bool
transcode_only
)
{
if
(
!
instance
)
...
...
@@ -55,18 +54,17 @@ public:
}
}
return
instance
;
}
;
}
virtual
~
SoutDialog
()
;
virtual
~
SoutDialog
()
{}
QString
getMrl
(){
return
mrl
;
}
private:
Ui
::
Sout
ui
;
static
SoutDialog
*
instance
;
SoutDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
bool
_transcode_only
=
false
);
static
SoutDialog
*
instance
;
Ui
::
Sout
ui
;
QPushButton
*
okButton
;
QString
mrl
;
bool
b_transcode_only
;
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
6db8acaa
...
...
@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs()
->
showTab
(
0
);
}
/****************************************************************************
* Menus / Interaction
****************************************************************************/
...
...
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