Commit 9e91be64 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

test: Remove trailing spaces in media_list_player.c.

parent afbdac28
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "libvlc_additions.h" #include "libvlc_additions.h"
/* /*
HACK - FIX ME HACK - FIX ME
This allows for the direct addition of subitems in the playback options test. This allows for the direct addition of subitems in the playback options test.
This would not be necessary if there were an add subitems function. This would not be necessary if there were an add subitems function.
...@@ -76,11 +76,11 @@ static void check_items_order_callback(const libvlc_event_t * p_event, void * us ...@@ -76,11 +76,11 @@ static void check_items_order_callback(const libvlc_event_t * p_event, void * us
free(title); free(title);
} }
assert(checks->items[checks->index] == md); assert(checks->items[checks->index] == md);
char *title = libvlc_media_get_meta(md, libvlc_meta_Title); char *title = libvlc_media_get_meta(md, libvlc_meta_Title);
log ("Item %d '%s' was correctly queued\n", checks->index, title); log ("Item %d '%s' was correctly queued\n", checks->index, title);
free(title); free(title);
if (checks->index == (checks->count - 1)) if (checks->index == (checks->count - 1))
{ {
log ("Done playing with success\n"); log ("Done playing with success\n");
...@@ -95,24 +95,24 @@ static void test_media_list_player_items_queue(const char** argv, int argc) ...@@ -95,24 +95,24 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
libvlc_media_t *md; libvlc_media_t *md;
libvlc_media_list_t *ml; libvlc_media_list_t *ml;
libvlc_media_list_player_t *mlp; libvlc_media_list_player_t *mlp;
const char * file = test_default_sample; const char * file = test_default_sample;
log ("Testing media player item queue-ing\n"); log ("Testing media player item queue-ing\n");
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
vlc = libvlc_new (argc, argv, &ex); vlc = libvlc_new (argc, argv, &ex);
catch (); catch ();
md = libvlc_media_new (vlc, file, &ex); md = libvlc_media_new (vlc, file, &ex);
catch (); catch ();
ml = libvlc_media_list_new (vlc, &ex); ml = libvlc_media_list_new (vlc, &ex);
catch (); catch ();
mlp = libvlc_media_list_player_new (vlc, &ex); mlp = libvlc_media_list_player_new (vlc, &ex);
catch (); catch ();
libvlc_media_list_add_media (ml, md, &ex); libvlc_media_list_add_media (ml, md, &ex);
catch (); catch ();
...@@ -138,7 +138,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc) ...@@ -138,7 +138,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
queue_expected_item(&check, media_list_add_file_path(vlc, subitems, file)); queue_expected_item(&check, media_list_add_file_path(vlc, subitems, file));
queue_expected_item(&check, media_list_add_file_path(vlc, subitems, file)); queue_expected_item(&check, media_list_add_file_path(vlc, subitems, file));
libvlc_media_list_release(subitems); libvlc_media_list_release(subitems);
libvlc_media_list_player_set_media_list (mlp, ml, &ex); libvlc_media_list_player_set_media_list (mlp, ml, &ex);
libvlc_event_manager_t * em = libvlc_media_list_player_event_manager(mlp); libvlc_event_manager_t * em = libvlc_media_list_player_event_manager(mlp);
...@@ -156,7 +156,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc) ...@@ -156,7 +156,7 @@ static void test_media_list_player_items_queue(const char** argv, int argc)
libvlc_media_list_player_release (mlp); libvlc_media_list_player_release (mlp);
catch (); catch ();
libvlc_release (vlc); libvlc_release (vlc);
catch (); catch ();
} }
...@@ -167,21 +167,21 @@ static void test_media_list_player_previous(const char** argv, int argc) ...@@ -167,21 +167,21 @@ static void test_media_list_player_previous(const char** argv, int argc)
libvlc_media_t *md; libvlc_media_t *md;
libvlc_media_list_t *ml; libvlc_media_list_t *ml;
libvlc_media_list_player_t *mlp; libvlc_media_list_player_t *mlp;
const char * file = test_default_sample; const char * file = test_default_sample;
log ("Testing media player previous()\n"); log ("Testing media player previous()\n");
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
vlc = libvlc_new (argc, argv, &ex); vlc = libvlc_new (argc, argv, &ex);
catch (); catch ();
md = libvlc_media_new (vlc, file, &ex); md = libvlc_media_new (vlc, file, &ex);
catch (); catch ();
ml = libvlc_media_list_new (vlc, &ex); ml = libvlc_media_list_new (vlc, &ex);
catch (); catch ();
mlp = libvlc_media_list_player_new (vlc, &ex); mlp = libvlc_media_list_player_new (vlc, &ex);
catch (); catch ();
...@@ -201,7 +201,7 @@ static void test_media_list_player_previous(const char** argv, int argc) ...@@ -201,7 +201,7 @@ static void test_media_list_player_previous(const char** argv, int argc)
libvlc_media_release (md); libvlc_media_release (md);
msleep(100000); msleep(100000);
libvlc_media_list_player_previous (mlp, &ex); libvlc_media_list_player_previous (mlp, &ex);
catch (); catch ();
...@@ -209,21 +209,21 @@ static void test_media_list_player_previous(const char** argv, int argc) ...@@ -209,21 +209,21 @@ static void test_media_list_player_previous(const char** argv, int argc)
catch(); catch();
msleep(100000); msleep(100000);
libvlc_media_list_player_previous (mlp, &ex); libvlc_media_list_player_previous (mlp, &ex);
catch (); catch ();
libvlc_media_list_player_stop (mlp, &ex); libvlc_media_list_player_stop (mlp, &ex);
catch (); catch ();
msleep(100000); msleep(100000);
libvlc_media_list_player_previous (mlp, &ex); libvlc_media_list_player_previous (mlp, &ex);
catch (); catch ();
libvlc_media_list_player_release (mlp); libvlc_media_list_player_release (mlp);
catch (); catch ();
libvlc_release (vlc); libvlc_release (vlc);
catch (); catch ();
} }
...@@ -234,21 +234,21 @@ static void test_media_list_player_next(const char** argv, int argc) ...@@ -234,21 +234,21 @@ static void test_media_list_player_next(const char** argv, int argc)
libvlc_media_t *md; libvlc_media_t *md;
libvlc_media_list_t *ml; libvlc_media_list_t *ml;
libvlc_media_list_player_t *mlp; libvlc_media_list_player_t *mlp;
const char * file = test_default_sample; const char * file = test_default_sample;
log ("Testing media player next()\n"); log ("Testing media player next()\n");
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
vlc = libvlc_new (argc, argv, &ex); vlc = libvlc_new (argc, argv, &ex);
catch (); catch ();
md = libvlc_media_new (vlc, file, &ex); md = libvlc_media_new (vlc, file, &ex);
catch (); catch ();
ml = libvlc_media_list_new (vlc, &ex); ml = libvlc_media_list_new (vlc, &ex);
catch (); catch ();
mlp = libvlc_media_list_player_new (vlc, &ex); mlp = libvlc_media_list_player_new (vlc, &ex);
catch (); catch ();
...@@ -261,14 +261,14 @@ static void test_media_list_player_next(const char** argv, int argc) ...@@ -261,14 +261,14 @@ static void test_media_list_player_next(const char** argv, int argc)
media_list_add_file_path (vlc, ml, file); media_list_add_file_path (vlc, ml, file);
libvlc_media_list_player_set_media_list (mlp, ml, &ex); libvlc_media_list_player_set_media_list (mlp, ml, &ex);
libvlc_media_list_player_play_item (mlp, md, &ex); libvlc_media_list_player_play_item (mlp, md, &ex);
catch (); catch ();
libvlc_media_release (md); libvlc_media_release (md);
msleep(100000); msleep(100000);
libvlc_media_list_player_next (mlp, &ex); libvlc_media_list_player_next (mlp, &ex);
catch (); catch ();
...@@ -276,21 +276,21 @@ static void test_media_list_player_next(const char** argv, int argc) ...@@ -276,21 +276,21 @@ static void test_media_list_player_next(const char** argv, int argc)
catch(); catch();
msleep(100000); msleep(100000);
libvlc_media_list_player_next (mlp, &ex); libvlc_media_list_player_next (mlp, &ex);
catch (); catch ();
libvlc_media_list_player_stop (mlp, &ex); libvlc_media_list_player_stop (mlp, &ex);
catch (); catch ();
msleep(100000); msleep(100000);
libvlc_media_list_player_next (mlp, &ex); libvlc_media_list_player_next (mlp, &ex);
catch (); catch ();
libvlc_media_list_player_release (mlp); libvlc_media_list_player_release (mlp);
catch (); catch ();
libvlc_release (vlc); libvlc_release (vlc);
catch (); catch ();
} }
...@@ -403,15 +403,15 @@ static void test_media_list_player_playback_options (const char** argv, int argc ...@@ -403,15 +403,15 @@ static void test_media_list_player_playback_options (const char** argv, int argc
libvlc_media_list_t *ml5; libvlc_media_list_t *ml5;
libvlc_media_list_t *ml6; libvlc_media_list_t *ml6;
libvlc_media_list_player_t *mlp; libvlc_media_list_player_t *mlp;
const char * file = test_default_sample; const char * file = test_default_sample;
log ("Testing media player playback options()\n"); log ("Testing media player playback options()\n");
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
vlc = libvlc_new (argc, argv, &ex); vlc = libvlc_new (argc, argv, &ex);
catch (); catch ();
/* /*
* Create the following media tree: * Create the following media tree:
* *
...@@ -438,10 +438,10 @@ static void test_media_list_player_playback_options (const char** argv, int argc ...@@ -438,10 +438,10 @@ static void test_media_list_player_playback_options (const char** argv, int argc
md5 = libvlc_media_new (vlc, file, &ex); md5 = libvlc_media_new (vlc, file, &ex);
catch (); catch ();
ml = libvlc_media_list_new (vlc, &ex); ml = libvlc_media_list_new (vlc, &ex);
catch (); catch ();
ml2 = libvlc_media_list_new (vlc, &ex); ml2 = libvlc_media_list_new (vlc, &ex);
catch (); catch ();
...@@ -493,14 +493,14 @@ static void test_media_list_player_playback_options (const char** argv, int argc ...@@ -493,14 +493,14 @@ static void test_media_list_player_playback_options (const char** argv, int argc
libvlc_media_list_add_media (ml, md3, &ex); libvlc_media_list_add_media (ml, md3, &ex);
catch (); catch ();
mlp = libvlc_media_list_player_new (vlc, &ex); mlp = libvlc_media_list_player_new (vlc, &ex);
catch (); catch ();
libvlc_media_list_player_set_media_list (mlp, ml, &ex); libvlc_media_list_player_set_media_list (mlp, ml, &ex);
catch (); catch ();
// Test default playback mode // Test default playback mode
libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_default, &ex); libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_default, &ex);
catch (); catch ();
...@@ -545,10 +545,10 @@ static void test_media_list_player_playback_options (const char** argv, int argc ...@@ -545,10 +545,10 @@ static void test_media_list_player_playback_options (const char** argv, int argc
catch (); catch ();
msleep(500000); msleep(500000);
libvlc_media_list_player_release (mlp); libvlc_media_list_player_release (mlp);
catch (); catch ();
libvlc_release (vlc); libvlc_release (vlc);
catch (); catch ();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment