VLM class almost done

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

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
index a6a7761d2d662bcd45e827d00fd80b0bdcb0c3e7..44adeeff29b6c339459880a916da44f0cf1dd70f 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
@@ -39,6 +39,7 @@ public interface LibVlc extends Library
 {
 
     LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc-control", LibVlc.class);
+
     LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE);
 
     public static class libvlc_exception_t extends Structure
@@ -51,6 +52,22 @@ public interface LibVlc extends Library
         public String message;
     }
 
+    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
     {
 
@@ -133,7 +150,7 @@ public interface LibVlc extends Library
 
     public class media_list_item_deleted extends Structure
     {
-        
+
         public LibVlcMediaDescriptor item;
 
         public int index;
@@ -195,21 +212,37 @@ public interface LibVlc extends Library
 
     public class event_type_specific extends Union
     {
+
         public media_meta_changed media_meta_changed;
+
         public media_subitem_added media_subitem_added;
+
         public media_duration_changed media_duration_changed;
+
         public media_preparsed_changed media_preparsed_changed;
+
         public media_freed media_freed;
+
         public media_state_changed media_state_changed;
+
         public media_player_position_changed media_player_position_changed;
+
         public media_player_time_changed media_player_time_changed;
+
         public media_list_item_added media_list_item_added;
+
         public media_list_will_add_item media_list_will_add_item;
+
         public media_list_item_deleted media_list_item_deleted;
+
         public media_list_will_delete_item media_list_will_delete_item;
+
         public media_list_view_item_added media_list_view_item_added;
+
         public media_list_view_will_add_item media_list_view_will_add_item;
+
         public media_list_view_item_deleted media_list_view_item_deleted;
+
         public media_list_view_will_delete_item media_list_view_will_delete_item;
     }
 
@@ -237,6 +270,14 @@ public interface LibVlc extends Library
     {
     }
 
+    public class LibVlcLog extends PointerType
+    {
+    }
+
+    public class LibVlcLogIterator extends PointerType
+    {
+    }
+
     // exception handling
     void libvlc_exception_init(libvlc_exception_t exception);
 
@@ -302,16 +343,16 @@ public interface LibVlc extends Library
 
     int libvlc_audio_set_volume(LibVlcInstance instance, int volume, libvlc_exception_t exception);
 
-    int libvlc_audio_get_track_count(LibVlcMediaInstance mediaInstance,  libvlc_exception_t exception );
+    int libvlc_audio_get_track_count(LibVlcMediaInstance mediaInstance, libvlc_exception_t exception);
+
+    int libvlc_audio_get_track(LibVlcMediaInstance mediaInstance, libvlc_exception_t exception);
 
-    int libvlc_audio_get_track(LibVlcMediaInstance mediaInstance, libvlc_exception_t exception );
-    
     void libvlc_audio_set_track(LibVlcMediaInstance mediaInstance, int channel, libvlc_exception_t exception);
-    
-    int libvlc_audio_get_channel(LibVlcInstance instance, libvlc_exception_t exception );
-    
+
+    int libvlc_audio_get_channel(LibVlcInstance instance, libvlc_exception_t exception);
+
     void libvlc_audio_set_channel(LibVlcInstance instance, int channel, libvlc_exception_t exception);
-    
+
     // playlist
 
     void libvlc_playlist_loop(LibVlcInstance instance, int loop, libvlc_exception_t exception);
@@ -345,25 +386,21 @@ public interface LibVlc extends Library
 
     // media descriptor
 
-    LibVlcMediaDescriptor libvlc_media_new(LibVlcInstance libvlc_instance, String mrl,
-        libvlc_exception_t exception);
+    LibVlcMediaDescriptor libvlc_media_new(LibVlcInstance libvlc_instance, String mrl, libvlc_exception_t exception);
 
-    void libvlc_media_add_option(LibVlcMediaDescriptor media, String option,
-        libvlc_exception_t exception);
+    void libvlc_media_add_option(LibVlcMediaDescriptor media, String option, libvlc_exception_t exception);
 
     String libvlc_media_get_mrl(LibVlcMediaDescriptor media);
 
     void libvlc_media_release(LibVlcMediaDescriptor media);
 
-    LibVlcEventManager libvlc_media_event_manager(LibVlcMediaDescriptor media,
-        libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_event_manager(LibVlcMediaDescriptor media, libvlc_exception_t exception);
 
     // media instance
 
     LibVlcMediaInstance libvlc_media_player_new(LibVlcInstance instance, libvlc_exception_t exception);
 
-    LibVlcMediaInstance libvlc_media_player_new_from_media(LibVlcMediaDescriptor media,
-        libvlc_exception_t exception);
+    LibVlcMediaInstance libvlc_media_player_new_from_media(LibVlcMediaDescriptor media, libvlc_exception_t exception);
 
     void libvlc_media_player_play(LibVlcMediaInstance media_player, libvlc_exception_t exception);
 
@@ -396,8 +433,7 @@ public interface LibVlc extends Library
 
     void libvlc_media_player_release(LibVlcMediaInstance instance);
 
-    LibVlcEventManager libvlc_media_player_event_manager(LibVlcMediaInstance media_player,
-        libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_player_event_manager(LibVlcMediaInstance media_player, libvlc_exception_t exception);
 
     // media list
 
@@ -408,17 +444,16 @@ public interface LibVlc extends Library
     void libvlc_media_list_add_file_content(LibVlcMediaList libvlc_media_list, String fileName,
         libvlc_exception_t exception);
 
-    void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list,
-        LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
-
-    LibVlcMediaDescriptor libvlc_media_list_media(LibVlcMediaList libvlc_media_list,
+    void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
         libvlc_exception_t exception);
 
-    void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list,
-        LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
+    LibVlcMediaDescriptor libvlc_media_list_media(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+
+    void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+        libvlc_exception_t exception);
 
-    void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list,
-        LibVlcMediaDescriptor libvlc_media, int position, libvlc_exception_t exception);
+    void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+        int position, libvlc_exception_t exception);
 
     void libvlc_media_list_remove_index(LibVlcMediaList libvlc_media_list, int position, libvlc_exception_t exception);
 
@@ -427,8 +462,8 @@ public interface LibVlc extends Library
     LibVlcMediaDescriptor libvlc_media_list_item_at_index(LibVlcMediaList libvlc_media_list, int position,
         libvlc_exception_t exception);
 
-    int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list,
-        LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
+    int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+        libvlc_exception_t exception);
 
     int libvlc_media_list_is_readonly(LibVlcMediaList libvlc_media_list);
 
@@ -436,8 +471,7 @@ public interface LibVlc extends Library
 
     // libvlc_media_list_player
 
-    LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance libvlc_media_player,
-        libvlc_exception_t exception);
+    LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance libvlc_media_player, libvlc_exception_t exception);
 
     void libvlc_media_list_player_release(LibVlcMediaListPlayer libvlc_media_list_player);
 
@@ -465,6 +499,38 @@ public interface LibVlc extends Library
 
     void libvlc_media_list_player_next(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
 
+    // VLM
+
+    void libvlc_vlm_add_broadcast(LibVlcInstance p_instance, String psz_name, String psz_input, String psz_output,
+        int i_options, String[] ppsz_options, int b_enabled, int b_loop, libvlc_exception_t p_e);
+
+    void libvlc_vlm_del_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
+
+    void libvlc_vlm_set_enabled(LibVlcInstance p_instance, String psz_name, int b_enabled, libvlc_exception_t p_e);
+
+    void libvlc_vlm_set_output(LibVlcInstance p_instance, String psz_name, String psz_output, libvlc_exception_t p_e);
+
+    void libvlc_vlm_set_input(LibVlcInstance p_instance, String psz_name, String psz_input, libvlc_exception_t p_e);
+
+    void libvlc_vlm_add_input(LibVlcInstance p_instance, String psz_name, String psz_input, libvlc_exception_t p_e);
+
+    void libvlc_vlm_set_loop(LibVlcInstance p_instance, String psz_name, int b_loop, libvlc_exception_t p_e);
+
+    void libvlc_vlm_change_media(LibVlcInstance p_instance, String psz_name, String psz_input, String psz_output,
+        int i_options, String[] ppsz_options, int b_enabled, int b_loop, libvlc_exception_t p_e);
+
+    void libvlc_vlm_play_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
+
+    void libvlc_vlm_stop_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
+
+    void libvlc_vlm_pause_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
+
+    void libvlc_vlm_seek_media(LibVlcInstance p_instance, String psz_name, float f_percentage, libvlc_exception_t p_e);
+
+    String libvlc_vlm_show_media(LibVlcInstance p_instance, String psz_name, libvlc_exception_t p_e);
+
+    void libvlc_vlm_release(LibVlcInstance p_instance, libvlc_exception_t p_e);
+    
     // event manager
 
     public static interface LibVlcCallback extends Callback
@@ -481,4 +547,27 @@ public interface LibVlc extends Library
 
     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);
+
 }