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
c8ab1739
Commit
c8ab1739
authored
Jul 27, 2010
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT4_vlm: really fix #3938.
parent
f6f5286a
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
102 additions
and
81 deletions
+102
-81
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+5
-0
modules/gui/qt4/dialogs/open.hpp
modules/gui/qt4/dialogs/open.hpp
+1
-0
modules/gui/qt4/dialogs/vlm.cpp
modules/gui/qt4/dialogs/vlm.cpp
+59
-55
modules/gui/qt4/dialogs/vlm.hpp
modules/gui/qt4/dialogs/vlm.hpp
+37
-26
No files found.
modules/gui/qt4/dialogs/open.cpp
View file @
c8ab1739
...
@@ -199,6 +199,11 @@ QString OpenDialog::getMRL( bool b_all )
...
@@ -199,6 +199,11 @@ QString OpenDialog::getMRL( bool b_all )
:
itemsMRL
[
0
];
:
itemsMRL
[
0
];
}
}
QString
OpenDialog
::
getOptions
()
{
return
ui
.
advancedLineInput
->
text
();
}
/* Finish the dialog and decide if you open another one after */
/* Finish the dialog and decide if you open another one after */
void
OpenDialog
::
setMenuAction
()
void
OpenDialog
::
setMenuAction
()
{
{
...
...
modules/gui/qt4/dialogs/open.hpp
View file @
c8ab1739
...
@@ -71,6 +71,7 @@ public:
...
@@ -71,6 +71,7 @@ public:
void
showTab
(
int
=
OPEN_FILE_TAB
);
void
showTab
(
int
=
OPEN_FILE_TAB
);
QString
getMRL
(
bool
b
=
true
);
QString
getMRL
(
bool
b
=
true
);
QString
getOptions
();
public
slots
:
public
slots
:
void
selectSlots
();
void
selectSlots
();
...
...
modules/gui/qt4/dialogs/vlm.cpp
View file @
c8ab1739
This diff is collapsed.
Click to expand it.
modules/gui/qt4/dialogs/vlm.hpp
View file @
c8ab1739
...
@@ -83,6 +83,8 @@ private:
...
@@ -83,6 +83,8 @@ private:
Ui
::
Vlm
ui
;
Ui
::
Vlm
ui
;
QString
inputOptions
;
QList
<
VLMAWidget
*>
vlmItems
;
QList
<
VLMAWidget
*>
vlmItems
;
int
currentIndex
;
int
currentIndex
;
...
@@ -117,21 +119,25 @@ public:
...
@@ -117,21 +119,25 @@ public:
VLMWrapper
(
vlm_t
*
);
VLMWrapper
(
vlm_t
*
);
virtual
~
VLMWrapper
();
virtual
~
VLMWrapper
();
static
void
AddBroadcast
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
AddBroadcast
(
const
QString
&
,
const
QString
&
,
bool
b_enabled
=
true
,
const
QString
&
,
const
QString
&
,
bool
b_loop
=
false
);
bool
b_enabled
=
true
,
bool
b_loop
=
false
);
static
void
EditBroadcast
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
EditBroadcast
(
const
QString
&
,
const
QString
&
,
bool
b_enabled
=
true
,
const
QString
&
,
const
QString
&
,
bool
b_loop
=
false
);
bool
b_enabled
=
true
,
bool
b_loop
=
false
);
static
void
EditSchedule
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
EditSchedule
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
const
QString
&
,
QDateTime
_schetime
,
QDateTime
_schedate
,
QDateTime
_schetime
,
QDateTime
_schedate
,
int
_scherepeatnumber
,
int
_repeatDays
,
int
_scherepeatnumber
,
int
_repeatDays
,
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
static
void
AddVod
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
AddVod
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
const
QString
&
,
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
static
void
EditVod
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
EditVod
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
const
QString
&
,
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
static
void
AddSchedule
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
static
void
AddSchedule
(
const
QString
&
,
const
QString
&
,
const
QString
&
,
const
QString
&
,
QDateTime
_schetime
,
QDateTime
_schedate
,
QDateTime
_schetime
,
QDateTime
_schedate
,
int
_scherepeatnumber
,
int
_repeatDays
,
int
_scherepeatnumber
,
int
_repeatDays
,
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
bool
b_enabled
=
true
,
const
QString
&
mux
=
""
);
...
@@ -153,13 +159,15 @@ class VLMAWidget : public QGroupBox
...
@@ -153,13 +159,15 @@ class VLMAWidget : public QGroupBox
Q_OBJECT
Q_OBJECT
friend
class
VLMDialog
;
friend
class
VLMDialog
;
public:
public:
VLMAWidget
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
output
,
VLMAWidget
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
inputOptions
,
const
QString
&
output
,
bool
_enable
,
VLMDialog
*
parent
,
int
_type
=
QVLM_Broadcast
);
bool
_enable
,
VLMDialog
*
parent
,
int
_type
=
QVLM_Broadcast
);
virtual
void
update
()
=
0
;
virtual
void
update
()
=
0
;
protected:
protected:
QLabel
*
nameLabel
;
QLabel
*
nameLabel
;
QString
name
;
QString
name
;
QString
input
;
QString
input
;
QString
inputOptions
;
QString
output
;
QString
output
;
bool
b_enabled
;
bool
b_enabled
;
int
type
;
int
type
;
...
@@ -176,7 +184,8 @@ class VLMBroadcast : public VLMAWidget
...
@@ -176,7 +184,8 @@ class VLMBroadcast : public VLMAWidget
Q_OBJECT
Q_OBJECT
friend
class
VLMDialog
;
friend
class
VLMDialog
;
public:
public:
VLMBroadcast
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
output
,
VLMBroadcast
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
inputOptions
,
const
QString
&
output
,
bool
_enable
,
bool
_loop
,
VLMDialog
*
parent
);
bool
_enable
,
bool
_loop
,
VLMDialog
*
parent
);
void
update
();
void
update
();
private:
private:
...
@@ -194,7 +203,8 @@ class VLMVod : public VLMAWidget
...
@@ -194,7 +203,8 @@ class VLMVod : public VLMAWidget
Q_OBJECT
Q_OBJECT
friend
class
VLMDialog
;
friend
class
VLMDialog
;
public:
public:
VLMVod
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
output
,
VLMVod
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
inputOptions
,
const
QString
&
output
,
bool
_enable
,
const
QString
&
_mux
,
VLMDialog
*
parent
);
bool
_enable
,
const
QString
&
_mux
,
VLMDialog
*
parent
);
void
update
();
void
update
();
private:
private:
...
@@ -207,7 +217,8 @@ class VLMSchedule : public VLMAWidget
...
@@ -207,7 +217,8 @@ class VLMSchedule : public VLMAWidget
Q_OBJECT
Q_OBJECT
friend
class
VLMDialog
;
friend
class
VLMDialog
;
public:
public:
VLMSchedule
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
output
,
VLMSchedule
(
const
QString
&
name
,
const
QString
&
input
,
const
QString
&
inputOptions
,
const
QString
&
output
,
QDateTime
schetime
,
QDateTime
schedate
,
int
repeatnumber
,
QDateTime
schetime
,
QDateTime
schedate
,
int
repeatnumber
,
int
repeatdays
,
bool
enabled
,
VLMDialog
*
parent
);
int
repeatdays
,
bool
enabled
,
VLMDialog
*
parent
);
void
update
();
void
update
();
...
...
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