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
986bb9de
Commit
986bb9de
authored
May 04, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: prefer dvd-simple when transcoding
parent
ec831631
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
modules/gui/qt4/components/open_panels.cpp
modules/gui/qt4/components/open_panels.cpp
+7
-0
modules/gui/qt4/components/open_panels.hpp
modules/gui/qt4/components/open_panels.hpp
+10
-0
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+3
-0
No files found.
modules/gui/qt4/components/open_panels.cpp
View file @
986bb9de
...
@@ -361,6 +361,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
...
@@ -361,6 +361,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
CONNECT
(
ui
.
chapterSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
chapterSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
audioSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
audioSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
subtitlesSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
subtitlesSpin
,
valueChanged
(
int
),
this
,
updateMRL
());
CONNECT
(
ui
.
dvdsimple
,
toggled
(
bool
),
this
,
updateMRL
());
/* Run once the updateButtons function in order to fill correctly the comboBoxes */
/* Run once the updateButtons function in order to fill correctly the comboBoxes */
updateButtons
();
updateButtons
();
...
@@ -446,6 +447,12 @@ void DiscOpenPanel::onFocus()
...
@@ -446,6 +447,12 @@ void DiscOpenPanel::onFocus()
}
}
#endif
#endif
void
DiscOpenPanel
::
updateContext
(
int
c
)
{
OpenPanel
::
updateContext
(
c
);
ui
.
dvdsimple
->
setChecked
(
context
==
OpenPanel
::
CONTEXT_BATCH
);
}
DiscOpenPanel
::~
DiscOpenPanel
()
DiscOpenPanel
::~
DiscOpenPanel
()
{
{
free
(
psz_dvddiscpath
);
free
(
psz_dvddiscpath
);
...
...
modules/gui/qt4/components/open_panels.hpp
View file @
986bb9de
...
@@ -68,13 +68,22 @@ public:
...
@@ -68,13 +68,22 @@ public:
OpenPanel
(
QWidget
*
p
,
intf_thread_t
*
_p_intf
)
:
QWidget
(
p
)
OpenPanel
(
QWidget
*
p
,
intf_thread_t
*
_p_intf
)
:
QWidget
(
p
)
{
{
p_intf
=
_p_intf
;
p_intf
=
_p_intf
;
context
=
CONTEXT_INTERACTIVE
;
}
}
virtual
~
OpenPanel
()
{};
virtual
~
OpenPanel
()
{};
virtual
void
clear
()
=
0
;
virtual
void
clear
()
=
0
;
virtual
void
onFocus
()
{}
virtual
void
onFocus
()
{}
virtual
void
onAccept
()
{}
virtual
void
onAccept
()
{}
static
const
int
CONTEXT_INTERACTIVE
=
0
;
static
const
int
CONTEXT_BATCH
=
1
;
virtual
void
updateContext
(
int
c
)
{
context
=
c
;
}
protected:
protected:
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
int
context
;
public
slots
:
public
slots
:
virtual
void
updateMRL
()
=
0
;
virtual
void
updateMRL
()
=
0
;
signals:
signals:
...
@@ -166,6 +175,7 @@ public:
...
@@ -166,6 +175,7 @@ public:
#if defined( _WIN32 ) || defined( __OS2__ )
#if defined( _WIN32 ) || defined( __OS2__ )
virtual
void
onFocus
();
virtual
void
onFocus
();
#endif
#endif
virtual
void
updateContext
(
int
)
Q_DECL_OVERRIDE
;
private:
private:
Ui
::
OpenDisk
ui
;
Ui
::
OpenDisk
ui
;
char
*
psz_dvddiscpath
,
*
psz_vcddiscpath
,
*
psz_cddadiscpath
;
char
*
psz_dvddiscpath
,
*
psz_vcddiscpath
,
*
psz_cddadiscpath
;
...
...
modules/gui/qt4/dialogs/open.cpp
View file @
986bb9de
...
@@ -297,6 +297,9 @@ void OpenDialog::signalCurrent( int i_tab )
...
@@ -297,6 +297,9 @@ void OpenDialog::signalCurrent( int i_tab )
assert
(
panel
);
assert
(
panel
);
panel
->
onFocus
();
panel
->
onFocus
();
panel
->
updateMRL
();
panel
->
updateMRL
();
panel
->
updateContext
(
i_action_flag
==
OPEN_AND_PLAY
?
OpenPanel
::
CONTEXT_INTERACTIVE
:
OpenPanel
::
CONTEXT_BATCH
);
}
}
}
}
...
...
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