videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

lib: remove useless libvlc_media_new_location() parameter

pull/136/head
Rémi Denis-Courmont 4 years ago
parent
9a887cbd49
commit
5aec19d53f
11 changed files with 30 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/libvlc/QtGL/qtvlcwidget.cpp
  2. 2
      doc/libvlc/appkit_player.m
  3. 4
      doc/libvlc/example.c
  4. 2
      doc/libvlc/gtk_player.c
  5. 2
      doc/libvlc/sdl_opengl_player.cpp
  6. 5
      include/vlc/libvlc_media.h
  7. 9
      lib/media.c
  8. 2
      test/libvlc/libvlc_additions.h
  9. 6
      test/libvlc/media.c
  10. 20
      test/libvlc/media_list_player.c
  11. 10
      test/libvlc/media_player.c

2
doc/libvlc/QtGL/qtvlcwidget.cpp
View File

@ -194,7 +194,7 @@ QtVLCWidget::QtVLCWidget(QWidget *parent)
bool QtVLCWidget::playMedia(const char* url) bool QtVLCWidget::playMedia(const char* url)
{ {
m_media = libvlc_media_new_location (m_vlc, url); m_media = libvlc_media_new_location(url);
if (m_media == nullptr) { if (m_media == nullptr) {
fprintf(stderr, "unable to create media %s", url); fprintf(stderr, "unable to create media %s", url);
return false; return false;

2
doc/libvlc/appkit_player.m
View File

@ -82,7 +82,7 @@
NSArray *args = [[NSProcessInfo processInfo] arguments]; NSArray *args = [[NSProcessInfo processInfo] arguments];
NSString *location = [args objectAtIndex:1]; NSString *location = [args objectAtIndex:1];
media = libvlc_media_new_location(instance, [location UTF8String]); media = libvlc_media_new_location([location UTF8String]);
libvlc_media_player_set_media(player, media); libvlc_media_player_set_media(player, media);
libvlc_media_player_set_nsobject(player, (__bridge void*)_view); libvlc_media_player_set_nsobject(player, (__bridge void*)_view);

4
doc/libvlc/example.c
View File

@ -17,8 +17,8 @@ int main(int argc, char* argv[])
inst = libvlc_new (0, NULL); inst = libvlc_new (0, NULL);
/* Create a new item */ /* Create a new item */
m = libvlc_media_new_location (inst, "http://mycool.movie.com/test.mov"); m = libvlc_media_new_location("http://mycool.movie.com/test.mov");
//m = libvlc_media_new_path (inst, "/path/to/test.mov"); //m = libvlc_media_new_path("/path/to/test.mov");
/* Create a media player playing environement */ /* Create a media player playing environement */
mp = libvlc_media_player_new_from_media (inst, m); mp = libvlc_media_player_new_from_media (inst, m);

2
doc/libvlc/gtk_player.c
View File

@ -45,7 +45,7 @@ void on_open(GtkWidget *widget, gpointer data) {
void open_media(const char* uri) { void open_media(const char* uri) {
libvlc_media_t *media; libvlc_media_t *media;
media = libvlc_media_new_location(vlc_inst, uri); media = libvlc_media_new_location(uri);
libvlc_media_player_set_media(media_player, media); libvlc_media_player_set_media(media_player, media);
play(); play();
libvlc_media_release(media); libvlc_media_release(media);

2
doc/libvlc/sdl_opengl_player.cpp
View File

@ -67,7 +67,7 @@ public:
bool playMedia(const char* url) bool playMedia(const char* url)
{ {
m_media = libvlc_media_new_location (m_vlc, url); m_media = libvlc_media_new_location(url);
if (m_media == NULL) { if (m_media == NULL) {
fprintf(stderr, "unable to create media %s", url); fprintf(stderr, "unable to create media %s", url);
return false; return false;

5
include/vlc/libvlc_media.h
View File

@ -276,13 +276,10 @@ typedef void (*libvlc_media_close_cb)(void *opaque);
* *
* \see libvlc_media_release * \see libvlc_media_release
* *
* \param p_instance the instance
* \param psz_mrl the media location * \param psz_mrl the media location
* \return the newly created media or NULL on error * \return the newly created media or NULL on error
*/ */
LIBVLC_API libvlc_media_t *libvlc_media_new_location( LIBVLC_API libvlc_media_t *libvlc_media_new_location(const char * psz_mrl);
libvlc_instance_t *p_instance,
const char * psz_mrl );
/** /**
* Create a media for a certain file path. * Create a media for a certain file path.

9
lib/media.c
View File

@ -505,8 +505,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(input_item_t *p_input_item )
} }
// Create a media with a certain given media resource location // Create a media with a certain given media resource location
libvlc_media_t *libvlc_media_new_location( libvlc_instance_t *p_instance, libvlc_media_t *libvlc_media_new_location(const char * psz_mrl)
const char * psz_mrl )
{ {
input_item_t * p_input_item; input_item_t * p_input_item;
libvlc_media_t * p_md; libvlc_media_t * p_md;
@ -538,7 +537,7 @@ libvlc_media_t *libvlc_media_new_path( libvlc_instance_t *p_instance,
return NULL; return NULL;
} }
libvlc_media_t *m = libvlc_media_new_location( p_instance, mrl ); libvlc_media_t *m = libvlc_media_new_location(mrl);
free( mrl ); free( mrl );
return m; return m;
} }
@ -549,7 +548,7 @@ libvlc_media_t *libvlc_media_new_fd( libvlc_instance_t *p_instance, int fd )
char mrl[16]; char mrl[16];
snprintf( mrl, sizeof(mrl), "fd://%d", fd ); snprintf( mrl, sizeof(mrl), "fd://%d", fd );
return libvlc_media_new_location( p_instance, mrl ); return libvlc_media_new_location(mrl);
} }
// Create a media with custom callbacks to read the data from // Create a media with custom callbacks to read the data from
@ -560,7 +559,7 @@ libvlc_media_t *libvlc_media_new_callbacks(libvlc_instance_t *p_instance,
libvlc_media_close_cb close_cb, libvlc_media_close_cb close_cb,
void *opaque) void *opaque)
{ {
libvlc_media_t *m = libvlc_media_new_location(p_instance, "imem://"); libvlc_media_t *m = libvlc_media_new_location("imem://");
if (unlikely(m == NULL)) if (unlikely(m == NULL))
return NULL; return NULL;

2
test/libvlc/libvlc_additions.h
View File

@ -21,7 +21,7 @@
static void* media_list_add_file_path(libvlc_instance_t *vlc, libvlc_media_list_t *ml, const char * file_path) static void* media_list_add_file_path(libvlc_instance_t *vlc, libvlc_media_list_t *ml, const char * file_path)
{ {
libvlc_media_t *md = libvlc_media_new_location (vlc, file_path); libvlc_media_t *md = libvlc_media_new_location(file_path);
libvlc_media_list_add_media (ml, md); libvlc_media_list_add_media (ml, md);
libvlc_media_release (md); libvlc_media_release (md);
return md; return md;

6
test/libvlc/media.c
View File

@ -115,7 +115,7 @@ static void test_media_preparsed(libvlc_instance_t *vlc, const char *path,
if (path != NULL) if (path != NULL)
media = libvlc_media_new_path (vlc, path); media = libvlc_media_new_path (vlc, path);
else else
media = libvlc_media_new_location (vlc, location); media = libvlc_media_new_location(location);
assert (media != NULL); assert (media != NULL);
vlc_sem_t sem; vlc_sem_t sem;
@ -324,7 +324,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
char *location; char *location;
assert (asprintf (&location, "%s%s", schemes[i], subitems_realpath) != -1); assert (asprintf (&location, "%s%s", schemes[i], subitems_realpath) != -1);
test_log ("Testing media_subitems: location: '%s'\n", location); test_log ("Testing media_subitems: location: '%s'\n", location);
media = libvlc_media_new_location (vlc, location); media = libvlc_media_new_location(location);
assert (media != NULL); assert (media != NULL);
test_media_subitems_media(vlc, media, false, true); test_media_subitems_media(vlc, media, false, true);
free (location); free (location);
@ -347,7 +347,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
#endif #endif
test_log ("Testing media_subitems failure\n"); test_log ("Testing media_subitems failure\n");
media = libvlc_media_new_location (vlc, "wrongfile://test"); media = libvlc_media_new_location("wrongfile://test");
assert (media != NULL); assert (media != NULL);
test_media_subitems_media(vlc, media, false, false); test_media_subitems_media(vlc, media, false, false);
libvlc_media_release (media); libvlc_media_release (media);

20
test/libvlc/media_list_player.c
View File

@ -121,7 +121,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);
@ -186,7 +186,7 @@ static void test_media_list_player_previous(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);
@ -245,7 +245,7 @@ static void test_media_list_player_next(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);
@ -304,7 +304,7 @@ static void test_media_list_player_pause_stop(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);
@ -344,7 +344,7 @@ static void test_media_list_player_play_item_at_index(const char** argv, int arg
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);
@ -403,19 +403,19 @@ static void test_media_list_player_playback_options (const char** argv, int argc
* ml5&6: 0 0 -- 1 * ml5&6: 0 0 -- 1
*/ */
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert(md); assert(md);
md2 = libvlc_media_new_location (vlc, file); md2 = libvlc_media_new_location(file);
assert(md2); assert(md2);
md3 = libvlc_media_new_location (vlc, file); md3 = libvlc_media_new_location(file);
assert(md3); assert(md3);
md4 = libvlc_media_new_location (vlc, file); md4 = libvlc_media_new_location(file);
assert(md4); assert(md4);
md5 = libvlc_media_new_location (vlc, file); md5 = libvlc_media_new_location(file);
assert(md5); assert(md5);
ml = libvlc_media_list_new (vlc); ml = libvlc_media_list_new (vlc);

10
test/libvlc/media_player.c
View File

@ -167,7 +167,7 @@ static void test_media_player_set_media(const char** argv, int argc)
libvlc_instance_t *vlc = libvlc_new (argc, argv); libvlc_instance_t *vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
libvlc_media_t *md = libvlc_media_new_location (vlc, file); libvlc_media_t *md = libvlc_media_new_location(file);
assert (md != NULL); assert (md != NULL);
libvlc_media_player_t *mp = libvlc_media_player_new (vlc); libvlc_media_player_t *mp = libvlc_media_player_new (vlc);
@ -196,7 +196,7 @@ static void test_media_player_play_stop(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert (md != NULL); assert (md != NULL);
mi = libvlc_media_player_new_from_media (vlc, md); mi = libvlc_media_player_new_from_media (vlc, md);
@ -223,7 +223,7 @@ static void test_media_player_pause_stop(const char** argv, int argc)
vlc = libvlc_new (argc, argv); vlc = libvlc_new (argc, argv);
assert (vlc != NULL); assert (vlc != NULL);
md = libvlc_media_new_location (vlc, file); md = libvlc_media_new_location(file);
assert (md != NULL); assert (md != NULL);
mi = libvlc_media_player_new_from_media (vlc, md); mi = libvlc_media_player_new_from_media (vlc, md);
@ -346,7 +346,7 @@ static void test_media_player_tracks(const char** argv, int argc)
/* Load the mock media */ /* Load the mock media */
libvlc_instance_t *vlc = libvlc_new (argc, new_argv); libvlc_instance_t *vlc = libvlc_new (argc, new_argv);
assert (vlc != NULL); assert (vlc != NULL);
libvlc_media_t *md = libvlc_media_new_location (vlc, file); libvlc_media_t *md = libvlc_media_new_location(file);
assert (md != NULL); assert (md != NULL);
libvlc_media_player_t *mp = libvlc_media_player_new (vlc); libvlc_media_player_t *mp = libvlc_media_player_new (vlc);
assert (mp != NULL); assert (mp != NULL);
@ -552,7 +552,7 @@ static void test_media_player_programs(const char** argv, int argc)
/* Load the mock media */ /* Load the mock media */
libvlc_instance_t *vlc = libvlc_new (argc, new_argv); libvlc_instance_t *vlc = libvlc_new (argc, new_argv);
assert (vlc != NULL); assert (vlc != NULL);
libvlc_media_t *md = libvlc_media_new_location (vlc, file); libvlc_media_t *md = libvlc_media_new_location(file);
assert (md != NULL); assert (md != NULL);
libvlc_media_player_t *mp = libvlc_media_player_new (vlc); libvlc_media_player_t *mp = libvlc_media_player_new (vlc);
assert (mp != NULL); assert (mp != NULL);

Write Preview
Loading…
Cancel
Save