Changeset e8eb613267bc9c9ba537fd99454e01aa14cc2137

Timestamp:

04/06/08 17:39:36 (3 months ago)

Author:

Filippo Carone <littlejohn@videolan.org>

git-committer:

Filippo Carone <littlejohn@videolan.org> 1207496376 +0200

git-parent:

[8a5846afcfc01e8f8e315ec1baee3cc6abc85e70]

git-author:

Cristian Maglie <megabug@autistici.org> 1207496278 +0200

Message:

Java bindings: added log functions. Removed @Override for java 1.5 compatibility

Signed-off-by: Filippo Carone <littlejohn@videolan.org>

Files:

• bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java (modified) (1 diff)
• bindings/java/core/src/main/java/org/videolan/jvlc/example/VLCExample.java (modified) (5 diffs)
• bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java (modified) (3 diffs)
• bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java (modified) (2 diffs)

bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java

@@ -50 +50 @@
-     * {@inheritDoc}
-     */
-    @Override
-    public void callback(libvlc_event_t libvlc_event, Pointer userData)
-    {

bindings/java/core/src/main/java/org/videolan/jvlc/example/VLCExample.java

@@ -37 +37 @@
-        {
-
-            @Override
-            public void endReached(MediaInstance mediaInstance)
-            {
@@ -43 +42 @@
-            }
-
-            @Override
-            public void paused(MediaInstance mediaInstance)
-            {
@@ -49 +47 @@
-            }
-
-            @Override
-            public void played(MediaInstance mediaInstance)
-            {
@@ -55 +52 @@
-            }
-
-            @Override
-            public void positionChanged(MediaInstance mediaInstance)
-            {
@@ -61 +57 @@
-            }
-
-            @Override
-            public void timeChanged(MediaInstance mediaInstance, long newTime)
-            {

bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java

@@ -53 +53 @@
-    }
-
+    public static class libvlc_log_message_t extends Structure
+    {
+
+        public int sizeof_msg; /* sizeof() of message structure, must be filled in by user */
+
+        public int i_severity; /* 0=INFO, 1=ERR, 2=WARN, 3=DBG */
+
+        public String psz_type; /* module type */
+
+        public String psz_name; /* module name */
+
+        public String psz_header; /* optional header */
+
+        public String psz_message; /* message */
+    }
+
-    public static class libvlc_event_t extends Structure
-    {
@@ -255 +271 @@
-    }
-
+    public class LibVlcLog extends PointerType
+    {
+    }
+
+    public class LibVlcLogIterator extends PointerType
+    {
+    }
+
-    // exception handling
-    void libvlc_exception_init(libvlc_exception_t exception);
@@ -522 +546 @@
-    void libvlc_toggle_fullscreen(LibVlcMediaInstance instance, libvlc_exception_t exception);
-
+    // logging
+
+    int libvlc_get_log_verbosity(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_set_log_verbosity(LibVlcInstance p_instance, int level, libvlc_exception_t p_e);
+
+    LibVlcLog libvlc_log_open(LibVlcInstance p_instance, libvlc_exception_t p_e);
+
+    void libvlc_log_close(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    int libvlc_log_count(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    void libvlc_log_clear(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    LibVlcLogIterator libvlc_log_get_iterator(LibVlcLog p_log, libvlc_exception_t p_e);
+
+    void libvlc_log_iterator_free(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+
+    int libvlc_log_iterator_has_next(LibVlcLogIterator p_iter, libvlc_exception_t p_e);
+
+    libvlc_log_message_t libvlc_log_iterator_next(LibVlcLogIterator p_iter, libvlc_log_message_t p_buffer,
+        libvlc_exception_t p_e);
+
-}

bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java

@@ -69 +69 @@
-        {
-
-            @Override
-            public void callback(libvlc_event_t libvlc_event_t, Pointer pointer)
-            {
@@ -79 +78 @@
-        {
-
-            @Override
-            public void callback(libvlc_event_t libvlc_event_t, Pointer pointer)
-            {