Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
0870d7c0
Commit
0870d7c0
authored
Aug 07, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dbus: move static const tables in the C file
remove useless prototype inline vlc identity in the only use case
parent
92b7fde9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
36 deletions
+32
-36
modules/control/dbus/dbus_root.c
modules/control/dbus/dbus_root.c
+32
-1
modules/control/dbus/dbus_root.h
modules/control/dbus/dbus_root.h
+0
-35
No files found.
modules/control/dbus/dbus_root.c
View file @
0870d7c0
...
...
@@ -37,13 +37,44 @@
#include "dbus_root.h"
#include "dbus_common.h"
static
const
char
*
ppsz_supported_uri_schemes
[]
=
{
"file"
,
"http"
,
"https"
,
"rtsp"
,
"realrtsp"
,
"pnm"
,
"ftp"
,
"mtp"
,
"smb"
,
"mms"
,
"mmsu"
,
"mmst"
,
"mmsh"
,
"unsv"
,
"itpc"
,
"icyx"
,
"rtmp"
,
"rtp"
,
"dccp"
,
"dvd"
,
"vcd"
,
"vcdx"
};
static
const
char
*
ppsz_supported_mime_types
[]
=
{
"audio/mpeg"
,
"audio/x-mpeg"
,
"video/mpeg"
,
"video/x-mpeg"
,
"video/mpeg-system"
,
"video/x-mpeg-system"
,
"video/mp4"
,
"audio/mp4"
,
"video/x-msvideo"
,
"video/quicktime"
,
"application/ogg"
,
"application/x-ogg"
,
"video/x-ms-asf"
,
"video/x-ms-asf-plugin"
,
"application/x-mplayer2"
,
"video/x-ms-wmv"
,
"video/x-google-vlc-plugin"
,
"audio/wav"
,
"audio/x-wav"
,
"audio/3gpp"
,
"video/3gpp"
,
"audio/3gpp2"
,
"video/3gpp2"
,
"video/divx"
,
"video/flv"
,
"video/x-flv"
,
"video/x-matroska"
,
"audio/x-matroska"
,
"application/xspf+xml"
};
DBUS_METHOD
(
Identity
)
{
VLC_UNUSED
(
p_this
);
REPLY_INIT
;
OUT_ARGUMENTS
;
c
har
*
psz_identity
=
VLC_IDENTITY
;
c
onst
char
*
psz_identity
=
_
(
"VLC media player"
)
;
DBusMessageIter
v
;
dbus_message_iter_open_container
(
&
args
,
DBUS_TYPE_VARIANT
,
"s"
,
&
v
);
...
...
modules/control/dbus/dbus_root.h
View file @
0870d7c0
...
...
@@ -29,8 +29,6 @@
#include "dbus_common.h"
#define VLC_IDENTITY _("VLC media player")
/* DBUS IDENTIFIERS */
#define DBUS_MPRIS_ROOT_INTERFACE "org.mpris.MediaPlayer2"
...
...
@@ -39,37 +37,4 @@ DBusHandlerResult handle_root ( DBusConnection *p_conn,
DBusMessage
*
p_from
,
void
*
p_this
);
static
const
char
*
ppsz_supported_uri_schemes
[]
=
{
"file"
,
"http"
,
"https"
,
"rtsp"
,
"realrtsp"
,
"pnm"
,
"ftp"
,
"mtp"
,
"smb"
,
"mms"
,
"mmsu"
,
"mmst"
,
"mmsh"
,
"unsv"
,
"itpc"
,
"icyx"
,
"rtmp"
,
"rtp"
,
"dccp"
,
"dvd"
,
"vcd"
,
"vcdx"
};
static
const
char
*
ppsz_supported_mime_types
[]
=
{
"audio/mpeg"
,
"audio/x-mpeg"
,
"video/mpeg"
,
"video/x-mpeg"
,
"video/mpeg-system"
,
"video/x-mpeg-system"
,
"video/mp4"
,
"audio/mp4"
,
"video/x-msvideo"
,
"video/quicktime"
,
"application/ogg"
,
"application/x-ogg"
,
"video/x-ms-asf"
,
"video/x-ms-asf-plugin"
,
"application/x-mplayer2"
,
"video/x-ms-wmv"
,
"video/x-google-vlc-plugin"
,
"audio/wav"
,
"audio/x-wav"
,
"audio/3gpp"
,
"video/3gpp"
,
"audio/3gpp2"
,
"video/3gpp2"
,
"video/divx"
,
"video/flv"
,
"video/x-flv"
,
"video/x-matroska"
,
"audio/x-matroska"
,
"application/xspf+xml"
};
void
UpdateRootCaps
(
intf_thread_t
*
p_intf
);
#endif //dbus-root.h
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