Merge branch 'master' into lpcm_encoder

[vlc] / test / libvlc / meta.c

diff --git a/test/libvlc/meta.c b/test/libvlc/meta.c
index d1d789586fac04be4c747793e931cc675025642a..aa29c98406f8444de7a3c6d3a59b621fd9e4ed1a 100644 (file)
--- a/test/libvlc/meta.c
+++ b/test/libvlc/meta.c
@@ -5,6 +5,7 @@
  */
 
 /**********************************************************************
+ *  Copyright (C) 2007 Rémi Denis-Courmont.                           *
  *  Copyright (C) 2008 Pierre d'Herbemont.                            *
  *  This program is free software; you can redistribute and/or modify *
  *  it under the terms of the GNU General Public License as published *
@@ -21,6 +22,8 @@
  *  http://www.gnu.org/copyleft/gpl.html                              *
  **********************************************************************/
 
+#include <string.h>
+
 #include "test.h"
 
 static void test_meta (const char ** argv, int argc)
@@ -31,30 +34,15 @@ static void test_meta (const char ** argv, int argc)
 
     log ("Testing meta\n");
 
-    libvlc_exception_init (&ex);
-    vlc = libvlc_new (argc, argv, &ex);
-    catch ();
-
-    media = libvlc_media_new (vlc, "samples/meta.sample", &ex);
-    catch ();
+    vlc = libvlc_new (argc, argv);
+    assert (vlc != NULL);
 
-    /* Tell that we are interested in this precise meta data
-     * This is needed to trigger meta data reading
-     * (the first calls return NULL) */
-    artist = libvlc_media_get_meta (media, libvlc_meta_Artist, &ex);
-    catch ();
-
-    free (artist);
+    media = libvlc_media_new_path (vlc, "samples/meta.sample");
+    assert( media );
 
-    /* Wait for the meta */
-    while (!libvlc_media_is_preparsed (media, &ex))
-    {
-        catch ();
-        msleep (10000);
-    }
+    libvlc_media_parse (media);
 
-    artist = libvlc_media_get_meta (media, libvlc_meta_Artist, &ex);
-    catch ();
+    artist = libvlc_media_get_meta (media, libvlc_meta_Artist);
 
     const char *expected_artist = "mike";