Media meta data support

This seems to trigger a pseudo-random native failure. Most likely a
critical bug in the VLC meta support.

diff --git a/bindings/cil/src/libvlc.cs b/bindings/cil/src/libvlc.cs
index 4cf488e13a3155d5df21800db50d2ed0dd7db6d8..bacaf7813723ec3f9a7a169b5ca151d33d00d7b3 100644 (file)
--- a/bindings/cil/src/libvlc.cs
+++ b/bindings/cil/src/libvlc.cs
@@ -118,10 +118,10 @@ namespace VideoLAN.LibVLC
         public static extern
         MediaHandle MediaDuplicate (MediaHandle media);
 
-        /*[DllImport (lib, EntryPoint="libvlc_media_read_meta")]
+        [DllImport (lib, EntryPoint="libvlc_media_get_meta")]
         public static extern
-        MediaHandle MediaDuplicate (MediaHandle media, int type,
-                                    NativeException ex);*/
+        StringHandle MediaGetMeta (MediaHandle media, MetaType type,
+                                   NativeException ex);
 
         [DllImport (lib, EntryPoint="libvlc_media_get_state")]
         public static extern

diff --git a/bindings/cil/src/media.cs b/bindings/cil/src/media.cs
index 1edf093fb2a0ad2c551a5b805ab179e4156759df..a18a936b886bb35e557da7cda0970048d1ff611e 100644 (file)
--- a/bindings/cil/src/media.cs
+++ b/bindings/cil/src/media.cs
@@ -225,6 +225,25 @@ namespace VideoLAN.LibVLC
             return Location;
         }
 
+        /**
+         * @param type meta data type
+         * @return the meta data value, or @a null if unknown
+         */
+        public string GetMeta (MetaType type)
+        {
+            StringHandle str = LibVLC.MediaGetMeta (Handle, type, ex);
+            Raise ();
+            return str.Transform ();
+        }
+
+        public delegate void MetaChange (Media media, MetaType type);
+        public event MetaChange MetaChanged;
+        private void MetaCallback (MediaMetaEvent ev, IntPtr data)
+        {
+            if (MetaChanged != null)
+                MetaChanged (this, ev.metaType);
+        }
+
         /**
          * Current state of the media.
          */

diff --git a/bindings/cil/tests/testvlc.cs b/bindings/cil/tests/testvlc.cs
index 1d4786c8d2f837b2a427bd6d6b777d88fc8c9c4c..9ea8a3188a32cc14da8b0b0b501b6dfc8b68deb6 100644 (file)
--- a/bindings/cil/tests/testvlc.cs
+++ b/bindings/cil/tests/testvlc.cs
@@ -75,6 +75,13 @@ namespace VideoLAN.LibVLC.Test
                 DumpMedia ((Media)media.Clone ());
                 media.StateChanged += WriteMediaState;
 
+                /*foreach (MetaType type in Enum.GetValues (typeof (MetaType)))
+                {
+                    string meta = media.GetMeta (type);
+                    if (meta != null)
+                        Console.WriteLine (" {0}: {1}", type, meta);
+                }*/
+
                 player.Play ();
                 do
                 {