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
04cb2556
Commit
04cb2556
authored
May 18, 2014
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: move playMRL slot from THEDP to RecentsMRL
parent
f2f7fd69
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
12 deletions
+8
-12
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+0
-9
modules/gui/qt4/dialogs_provider.hpp
modules/gui/qt4/dialogs_provider.hpp
+0
-2
modules/gui/qt4/recents.cpp
modules/gui/qt4/recents.cpp
+6
-1
modules/gui/qt4/recents.hpp
modules/gui/qt4/recents.hpp
+2
-0
No files found.
modules/gui/qt4/dialogs_provider.cpp
View file @
04cb2556
...
@@ -813,12 +813,3 @@ void DialogsProvider::SDMenuAction( const QString& data )
...
@@ -813,12 +813,3 @@ void DialogsProvider::SDMenuAction( const QString& data )
playlist_ServicesDiscoveryRemove
(
THEPL
,
qtu
(
data
)
);
playlist_ServicesDiscoveryRemove
(
THEPL
,
qtu
(
data
)
);
}
}
/**
* Play the MRL contained in the Recently played menu.
**/
void
DialogsProvider
::
playMRL
(
const
QString
&
mrl
)
{
playlist_Add
(
THEPL
,
qtu
(
mrl
),
NULL
,
PLAYLIST_APPEND
|
PLAYLIST_GO
,
PLAYLIST_END
,
true
,
pl_Unlocked
);
RecentsMRL
::
getInstance
(
p_intf
)
->
addRecent
(
mrl
);
}
modules/gui/qt4/dialogs_provider.hpp
View file @
04cb2556
...
@@ -110,8 +110,6 @@ private:
...
@@ -110,8 +110,6 @@ private:
void
saveAPlaylist
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_node
);
void
saveAPlaylist
(
playlist_t
*
p_playlist
,
playlist_item_t
*
p_node
);
public
slots
:
public
slots
:
void
playMRL
(
const
QString
&
);
void
playlistDialog
();
void
playlistDialog
();
void
bookmarksDialog
();
void
bookmarksDialog
();
void
mediaInfoDialog
();
void
mediaInfoDialog
();
...
...
modules/gui/qt4/recents.cpp
View file @
04cb2556
...
@@ -55,7 +55,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
...
@@ -55,7 +55,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
signalMapper
=
new
QSignalMapper
(
this
);
signalMapper
=
new
QSignalMapper
(
this
);
CONNECT
(
signalMapper
,
CONNECT
(
signalMapper
,
mapped
(
const
QString
&
),
mapped
(
const
QString
&
),
DialogsProvider
::
getInstance
(
p_intf
)
,
this
,
playMRL
(
const
QString
&
)
);
playMRL
(
const
QString
&
)
);
/* Load the filter psz */
/* Load the filter psz */
...
@@ -163,6 +163,11 @@ playlist_item_t *RecentsMRL::toPlaylist(int length)
...
@@ -163,6 +163,11 @@ playlist_item_t *RecentsMRL::toPlaylist(int length)
return
p_node_recent
;
return
p_node_recent
;
}
}
void
RecentsMRL
::
playMRL
(
const
QString
&
mrl
)
{
Open
::
openMRL
(
p_intf
,
mrl
);
}
void
Open
::
openMRL
(
intf_thread_t
*
p_intf
,
void
Open
::
openMRL
(
intf_thread_t
*
p_intf
,
const
QString
&
mrl
,
const
QString
&
mrl
,
bool
b_start
,
bool
b_start
,
...
...
modules/gui/qt4/recents.hpp
View file @
04cb2556
...
@@ -66,8 +66,10 @@ private:
...
@@ -66,8 +66,10 @@ private:
void
load
();
void
load
();
void
save
();
void
save
();
public
slots
:
public
slots
:
void
clear
();
void
clear
();
void
playMRL
(
const
QString
&
);
};
};
#endif
#endif
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