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
ec6233e6
Commit
ec6233e6
authored
Sep 11, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: implement forgotten function in ML
parent
da41b00c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+8
-4
modules/gui/qt4/dialogs/open.hpp
modules/gui/qt4/dialogs/open.hpp
+4
-2
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+5
-2
No files found.
modules/gui/qt4/dialogs/open.cpp
View file @
ec6233e6
...
@@ -37,11 +37,12 @@
...
@@ -37,11 +37,12 @@
OpenDialog
*
OpenDialog
::
instance
=
NULL
;
OpenDialog
*
OpenDialog
::
instance
=
NULL
;
OpenDialog
*
OpenDialog
::
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
OpenDialog
*
OpenDialog
::
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
bool
b_rawInstance
,
int
_action_flag
,
bool
b_selectMode
)
bool
b_rawInstance
,
int
_action_flag
,
bool
b_selectMode
,
bool
_b_pl
)
{
{
/* Creation */
/* Creation */
if
(
!
instance
)
if
(
!
instance
)
instance
=
new
OpenDialog
(
parent
,
p_intf
,
b_selectMode
,
_action_flag
);
instance
=
new
OpenDialog
(
parent
,
p_intf
,
b_selectMode
,
_action_flag
,
_b_pl
);
else
if
(
!
b_rawInstance
)
else
if
(
!
b_rawInstance
)
{
{
/* Request the instance but change small details:
/* Request the instance but change small details:
...
@@ -54,6 +55,7 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
...
@@ -54,6 +55,7 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
if the call is correct */
if the call is correct */
}
}
instance
->
i_action_flag
=
_action_flag
;
instance
->
i_action_flag
=
_action_flag
;
instance
->
b_pl
=
_b_pl
;
instance
->
setMenuAction
();
instance
->
setMenuAction
();
}
}
return
instance
;
return
instance
;
...
@@ -62,9 +64,11 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
...
@@ -62,9 +64,11 @@ OpenDialog* OpenDialog::getInstance( QWidget *parent, intf_thread_t *p_intf,
OpenDialog
::
OpenDialog
(
QWidget
*
parent
,
OpenDialog
::
OpenDialog
(
QWidget
*
parent
,
intf_thread_t
*
_p_intf
,
intf_thread_t
*
_p_intf
,
bool
b_selectMode
,
bool
b_selectMode
,
int
_action_flag
)
:
QVLCDialog
(
parent
,
_p_intf
)
int
_action_flag
,
bool
_b_pl
)
:
QVLCDialog
(
parent
,
_p_intf
)
{
{
i_action_flag
=
_action_flag
;
i_action_flag
=
_action_flag
;
b_pl
=
_b_pl
;
/* Workaround the Win32 Vout that put the video on top at regular times */
/* Workaround the Win32 Vout that put the video on top at regular times */
#ifdef WIN32
#ifdef WIN32
...
@@ -334,7 +338,7 @@ void OpenDialog::finish( bool b_enqueue = false )
...
@@ -334,7 +338,7 @@ void OpenDialog::finish( bool b_enqueue = false )
/* FIXME: playlist_AddInput() can fail */
/* FIXME: playlist_AddInput() can fail */
playlist_AddInput
(
THEPL
,
p_input
,
playlist_AddInput
(
THEPL
,
p_input
,
PLAYLIST_APPEND
|
(
b_start
?
PLAYLIST_GO
:
PLAYLIST_PREPARSE
),
PLAYLIST_APPEND
|
(
b_start
?
PLAYLIST_GO
:
PLAYLIST_PREPARSE
),
PLAYLIST_END
,
tru
e
,
pl_Unlocked
);
PLAYLIST_END
,
b_pl
?
true
:
fals
e
,
pl_Unlocked
);
vlc_gc_decref
(
p_input
);
vlc_gc_decref
(
p_input
);
}
}
}
}
...
...
modules/gui/qt4/dialogs/open.hpp
View file @
ec6233e6
...
@@ -62,7 +62,8 @@ class OpenDialog : public QVLCDialog
...
@@ -62,7 +62,8 @@ class OpenDialog : public QVLCDialog
Q_OBJECT
;
Q_OBJECT
;
public:
public:
static
OpenDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
static
OpenDialog
*
getInstance
(
QWidget
*
parent
,
intf_thread_t
*
p_intf
,
bool
b_rawInstance
=
false
,
int
_action_flag
=
0
,
bool
b_selectMode
=
false
);
bool
b_rawInstance
=
false
,
int
_action_flag
=
0
,
bool
b_selectMode
=
false
,
bool
b_pl
=
true
);
static
void
killInstance
()
static
void
killInstance
()
{
{
...
@@ -83,7 +84,7 @@ public slots:
...
@@ -83,7 +84,7 @@ public slots:
private:
private:
OpenDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
bool
b_selectMode
,
OpenDialog
(
QWidget
*
parent
,
intf_thread_t
*
,
bool
b_selectMode
,
int
_action_flag
=
0
);
int
_action_flag
=
0
,
bool
b_pl
=
true
);
static
OpenDialog
*
instance
;
static
OpenDialog
*
instance
;
input_thread_t
*
p_input
;
input_thread_t
*
p_input
;
...
@@ -99,6 +100,7 @@ private:
...
@@ -99,6 +100,7 @@ private:
CaptureOpenPanel
*
captureOpenPanel
;
CaptureOpenPanel
*
captureOpenPanel
;
int
i_action_flag
;
int
i_action_flag
;
bool
b_pl
;
QStringList
SeparateEntries
(
QString
);
QStringList
SeparateEntries
(
QString
);
QPushButton
*
cancelButton
,
*
selectButton
;
QPushButton
*
cancelButton
,
*
selectButton
;
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
ec6233e6
...
@@ -336,9 +336,12 @@ void DialogsProvider::PLAppendDialog()
...
@@ -336,9 +336,12 @@ void DialogsProvider::PLAppendDialog()
->
showTab
(
OPEN_FILE_TAB
);
->
showTab
(
OPEN_FILE_TAB
);
}
}
/* Unimplemmented yet - Usefull ? */
void
DialogsProvider
::
MLAppendDialog
()
void
DialogsProvider
::
MLAppendDialog
()
{}
{
OpenDialog
::
getInstance
(
p_intf
->
p_sys
->
p_mi
,
p_intf
,
false
,
OPEN_AND_ENQUEUE
,
false
,
false
)
->
showTab
(
OPEN_FILE_TAB
);
}
/**
/**
* Simple open
* Simple open
...
...
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