- * The resultant string will be truncated to the size of the buffer if it would - * otherwise exceed it. - *
- * For example, if the buffer has a capacity of 10 this is a maximum of 9
- * characters plus a null terminator for a total capacity of 10. This means if
- * 10 characters are required, the buffer capacity must be 11 to accommodate
- * the null terminator.
- *
- * @param str buffer
- * @param size capacity of the buffer, including space for a null terminator
- * @param format format string
- * @param args format arguments
- * @return length of the formatted string, which may exceed the capacity of the buffer, or less than zero on error
- */
- int vsnprintf(ByteBuffer str, int size, String format, Pointer args);
-
- /**
- * Locks (pins) parts of virtual address space into RAM so it can not be swapped out.
- *
- * @param addr address pointer
- * @param length length
- * @return 0 if successful; -1 if not, setting errno to an error code
- */
- int mlock(Pointer addr, NativeLong length);
-
- /**
- * Unlock previously locked memory.
- *
- * @param addr address pointer
- * @param length length
- * @return 0 if successful; -1 if not, setting errno to an error code
- */
- int munlock(Pointer addr, NativeLong length);
-
- /**
- * Change or add an evironment variable.
- *
- * The value strings are copied (natively). - *
- * Not available on Windows.
- *
- * @param name name of environment variable
- * @param value value of the environment variable
- * @param overwrite non-zero to replace any existing value
- * @return 0 if successful; -1 if not, setting errno to an error code
- */
- int setenv(String name, String value, int overwrite);
-
- /**
- * Unset an environment variable.
- *
- * Not available on Windows.
- *
- * @param name name of environment variable
- * @return 0 if successful; -1 if not, setting errno to an error code
- */
- int unsetenv(String name);
-
- /**
- * Get the current process id.
- *
- * Not available on Windows. - * - * @return process id - */ - int getpid(); - - /** - * Closest Windows equivalent to {@link #setenv(String, String, int)}. - *
- * Note that after setting an environment variable, it will not show up via - * System#getenv even if it was successfully set. - *
- * Use with case, it is not guaranteed to be thread-safe. - *
- * Only available on Windows.
- *
- * @param envstring variable and value to set, in the format "variable=value", without quotes.
- * @return zero on success, non-zero on error
- */
- int _putenv(String envstring);
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibDwmApi.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibDwmApi.java
deleted file mode 100644
index 32f340b5..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibDwmApi.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This library is only available on Windows platforms. - *
- * The functionality provided by this library may be helpful especially when working with - * full-screen exclusive mode in Java which suffers from numerous idiosyncrasies on Windows, some of - * which can be mitigated by ensuring that desktop window composition is disabled. Disabling - * composition can be done at the operating system level, but is more convenient for end-users if - * the application itself does it. - *
- * This class may be removed in future versions of vlcj due to it's uselessness.
- */
-public interface LibDwmApi extends Library {
-
- /**
- * Native library instance.
- */
- // WATERMeDIA PATCH - start
- LibDwmApi INSTANCE = Native.loadLibrary("dwmapi", LibDwmApi.class);
- // WATERMeDIA PATCH - end
-
- /**
- * Disable composition.
- */
- int DWM_EC_DISABLECOMPOSITION = 0;
-
- /**
- * Enable composition.
- */
- int DWM_EC_ENABLECOMPOSITION = 1;
-
- /**
- * API success code.
- */
- int S_OK = 0;
-
- /**
- * Enable/disable desktop window composition.
- *
- * @param uCompositionAction enable/disable, i.e. DWM_EC_ENABLECOMPOSITION or DWM_EC_DISABLECOMPOSITION
- * @return S_OK or HRESULT error code
- */
- HRESULT DwmEnableComposition(int uCompositionAction);
-
- /**
- * Check whether or not desktop window composition is currently enabled.
- *
- * @param pfEnabled pointer to enabled/disabled flag.
- * @return S_OK or HRESULT error code
- */
- HRESULT DwmIsCompositionEnabled(IntByReference pfEnabled);
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibVlc.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibVlc.java
deleted file mode 100644
index 4b057f89..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibVlc.java
+++ /dev/null
@@ -1,2979 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This is not a complete interface to libvlc, although most functions are present. - *
- * This interface specifies the exposed methods only, the types and structures are all factored out separately in the - * "internal" sub-package. - *
- * This code and that in the internal sub-package is structured out of necessity to interoperate with the libvlc native - * library. This code was originally derived (but has now been completely re-written) from the original JVLC source - * code, the copyright of which belongs to the VideoLAN team, which was distributed under GPL version 2 or later. - *
- * This system property may be useful for debugging: - *
- * -Djna.dump_memory=true - *- * In the native header file, generally "char*" types must be freed, but "const char*" need (must) not. - *
- * This interface is essentially a translation of the LibVLC header files to Java, with changes for JNA/Java types. The - * documentation in that VLC header file is reproduced here for convenience, with the appropriate Javadoc documentation - * convention changes, the copyright of which (mostly) belongs to the VLC authors. - */ -public final class LibVlc { - - static { - Native.register(RuntimeUtil.getLibVlcLibraryName()); - } - - private LibVlc() { - } - - // === libvlc.h ============================================================= - - /** - * A human-readable error message for the last LibVLC error in the calling thread. The resulting - * string is valid until another error occurs (at least until the next LibVLC call). - *
- * This will be NULL if there was no error.
- *
- * @return error message, or NULL
- */
- public static native String libvlc_errmsg();
-
- /**
- * Clears the LibVLC error status for the current thread. This is optional. By default, the
- * error status is automatically overridden when a new error occurs, and destroyed when the
- * thread exits.
- */
- public static native void libvlc_clearerr();
-
- /**
- * Create and initialize a libvlc instance.
- *
- * @param argc the number of arguments
- * @param argv command-line-type arguments
- * @return the libvlc instance or NULL in case of error
- */
- public static native libvlc_instance_t libvlc_new(int argc, StringArray argv);
-
- /**
- * Decrement the reference count of a libvlc instance, and destroy it if it reaches zero.
- *
- * @param p_instance the instance to destroy
- */
- public static native void libvlc_release(libvlc_instance_t p_instance);
-
- /**
- * Increments the reference count of a libvlc instance. The initial reference count is 1 after
- * libvlc_new() returns.
- *
- * @param p_instance the instance to reference
- */
- public static native void libvlc_retain(libvlc_instance_t p_instance);
-
- /**
- * Try to start a user interface for the libvlc instance.
- *
- * @param p_instance the instance
- * @param name interface name, or NULL for default
- * @return 0 on success, -1 on error.
- */
- public static native int libvlc_add_intf(libvlc_instance_t p_instance, String name);
-
- /**
- * Sets the application name. LibVLC passes this as the user agent string when a protocol
- * requires it.
- *
- * @param p_instance LibVLC instance
- * @param name human-readable application name, e.g. "FooBar player 1.2.3"
- * @param http HTTP User Agent, e.g. "FooBar/1.2.3 Python/2.6.0"
- * @since LibVLC 1.1.1
- */
- public static native void libvlc_set_user_agent(libvlc_instance_t p_instance, String name, String http);
-
- /**
- * Sets some meta-informations about the application.
- *
- * See also {@link #libvlc_set_user_agent(libvlc_instance_t, String, String)}. - * - * @param p_instance LibVLC instance - * @param id Java-style application identifier, e.g. "com.acme.foobar" - * @param version application version numbers, e.g. "1.2.3" - * @param icon application icon name, e.g. "foobar" - * @since LibVLC 2.1.0 - */ - public static native void libvlc_set_app_id(libvlc_instance_t p_instance, String id, String version, String icon); - - /** - * Retrieve libvlc version. Example: "1.1.0-git The Luggage" - * - * @return a string containing the libvlc version - */ - public static native String libvlc_get_version(); - - /** - * Retrieve libvlc compiler version. Example: "gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu6)" - * - * @return a string containing the libvlc compiler version - */ - public static native String libvlc_get_compiler(); - - /** - * Retrieve libvlc changeset. Example: "aa9bce0bc4" - * - * @return a string containing the libvlc changeset - */ - public static native String libvlc_get_changeset(); - - /** - * Frees an heap allocation returned by a LibVLC function. If you know you're using the same - * underlying C run-time as the LibVLC implementation, then you can call ANSI C free() directly - * instead. - * - * @param ptr the pointer - */ - public static native void libvlc_free(Pointer ptr); - - /** - * Register for an event notification. - * - * @param p_event_manager the event manager to which you want to attach to. Generally it is - * obtained by vlc_my_object_event_manager() where my_object is the object you want - * to listen to. - * @param i_event_type the desired event to which we want to listen - * @param f_callback the function to call when i_event_type occurs - * @param user_data user provided data to carry with the event - * @return 0 on success, ENOMEM on error - */ - public static native int libvlc_event_attach(libvlc_event_manager_t p_event_manager, int i_event_type, libvlc_callback_t f_callback, Pointer user_data); - - /** - * Unregister an event notification. - * - * @param p_event_manager the event manager - * @param i_event_type the desired event to which we want to unregister - * @param f_callback the function to call when i_event_type occurs - * @param p_user_data user provided data to carry with the event - */ - public static native void libvlc_event_detach(libvlc_event_manager_t p_event_manager, int i_event_type, libvlc_callback_t f_callback, Pointer p_user_data); - - /** - * Gets debugging informations about a log message: the name of the VLC module - * emitting the message and the message location within the source code. - *
- * The returned module name and file name will be NULL if unknown. - *
- * The returned line number will similarly be zero if unknown. - *
- * The returned module name and source code file name, if non-NULL, - * are only valid until the logging callback returns.* - * - * @param ctx message context (as passed to the {@link libvlc_log_cb}) - * @param module module name storage (or NULL) [OUT] - * @param file source code file name storage (or NULL) [OUT] - * @param line source code file line number storage (or NULL) [OUT] - * - * @since LibVLC 2.1.0 or later - */ - public static native void libvlc_log_get_context(libvlc_log_t ctx, PointerByReference module, PointerByReference file, IntByReference line); - - /** - * Gets VLC object informations about a log message: the type name of the VLC - * object emitting the message, the object header if any and a temporaly-unique - * object identifier. These informations are mainly meant for manual - * troubleshooting. - *
- * The returned type name may be "generic" if unknown, but it cannot be NULL. - *
- * The returned header will be NULL if unset; in current versions, the header - * is used to distinguish for VLM inputs. - *
- * The returned object ID will be zero if the message is not associated with - * any VLC object. - *
- * The returned module name and source code file name, if non-NULL, - * are only valid until the logging callback returns. - * - * @param ctx message context (as passed to the {@link libvlc_log_cb}) - * @param name object name storage (or NULL) [OUT] - * @param header object header (or NULL) [OUT] - * @param id source code file line number storage (or NULL) [OUT] - * - * @since LibVLC 2.1.0 or later - */ - public static native void libvlc_log_get_object(libvlc_log_t ctx, PointerByReference name, PointerByReference header, IntByReference id); - - /** - * Unsets the logging callback for a LibVLC instance. This is rarely needed: - * the callback is implicitly unset when the instance is destroyed. - *
- * This function will wait for any pending callbacks invocation to complete - * (causing a deadlock if called from within the callback). - * - * @param p_instance the instance - * - * @since LibVLC 2.1.0 or later - */ - public static native void libvlc_log_unset(libvlc_instance_t p_instance); - - /** - * Sets the logging callback for a LibVLC instance. - *
- * This function is thread-safe: it will wait for any pending callbacks - * invocation to complete. - *
- * Some log messages (especially debug) are emitted by LibVLC while - * is being initialized. These messages cannot be captured with this interface. - *
- * A deadlock may occur if this function is called from the callback. - * - * @param p_instance the instance - * @param cb callback function pointer - * @param data opaque data pointer for the callback function - * - * @since LibVLC 2.1.0 or later - */ - public static native void libvlc_log_set(libvlc_instance_t p_instance, libvlc_log_cb cb, Pointer data); - - /** - * Release a list of module descriptions. - * - * @param p_list the list to be released - */ - public static native void libvlc_module_description_list_release(Pointer p_list); - - /** - * Returns a list of audio filters that are available. - * - * @param p_instance libvlc instance - * @return a list of module descriptions. It should be freed with - * libvlc_module_description_list_release(). In case of an error, NULL is returned. - * @see libvlc_module_description_t - * @see #libvlc_module_description_list_release(Pointer) - */ - public static native libvlc_module_description_t libvlc_audio_filter_list_get(libvlc_instance_t p_instance); - - /** - * Returns a list of video filters that are available. - * - * @param p_instance libvlc instance - * @return a list of module descriptions. It should be freed with - * libvlc_module_description_list_release(). In case of an error, NULL is returned. - * @see libvlc_module_description_t - * @see #libvlc_module_description_list_release(Pointer) - */ - public static native libvlc_module_description_t libvlc_video_filter_list_get(libvlc_instance_t p_instance); - - /** - * Return the current time as defined by LibVLC. The unit is the microsecond. Time increases - * monotonically (regardless of time zone changes and RTC adjustments). The origin is arbitrary - * but consistent across the whole system (e.g. the system uptime, the time since the system was - * booted). \note On systems that support it, the POSIX monotonic clock is used. - * - * @return clock value - */ - public static native long libvlc_clock(); - - // === libvlc.h ============================================================= - - // === libvlc_media.h ======================================================= - - /** - * Create a media with a certain given media resource location. - * - * @see #libvlc_media_release(libvlc_media_t) - * @param p_instance the instance - * @param psz_mrl the MRL to read - * @return the newly created media or NULL on error - */ - public static native libvlc_media_t libvlc_media_new_location(libvlc_instance_t p_instance, String psz_mrl); - - /** - * Create a media with a certain file path. - * - * @see #libvlc_media_release(libvlc_media_t) - * @param p_instance the instance - * @param path local filesystem path - * @return the newly created media or NULL on error - */ - public static native libvlc_media_t libvlc_media_new_path(libvlc_instance_t p_instance, String path); - - /** - * Create a media with custom callbacks to read the data from. - *
- * If open_cb is NULL, the opaque pointer will be passed to read_cb, - * seek_cb and close_cb, and the stream size will be treated as unknown. - *
- * The callbacks may be called asynchronously (from another thread). - * A single stream instance need not be reentrant. However the open_cb needs to - * be reentrant if the media is used by multiple player instances. - *
- * The callbacks may be used until all or any player instances - * that were supplied the media item are stopped. - *
- * @see #libvlc_media_release(libvlc_media_t) - * - * @since LibVLC 3.0.0 and later. - * - * @param instance LibVLC instance - * @param open_cb callback to open the custom bitstream input media - * @param read_cb callback to read data (must not be NULL) - * @param seek_cb callback to seek, or NULL if seeking is not supported - * @param close_cb callback to close the media, or NULL if unnecessary - * @param opaque data pointer for the open callback - * @return the newly created media or NULL on error - */ - public static native libvlc_media_t libvlc_media_new_callbacks(libvlc_instance_t instance, libvlc_media_open_cb open_cb, libvlc_media_read_cb read_cb, libvlc_media_seek_cb seek_cb, libvlc_media_close_cb close_cb, Pointer opaque); - - /** - * Create a media as an empty node with a given name. - * - * @see #libvlc_media_release(libvlc_media_t) - * @param p_instance the instance - * @param psz_name the name of the node - * @return the new empty media or NULL on error - */ - public static native libvlc_media_t libvlc_media_new_as_node(libvlc_instance_t p_instance, String psz_name); - - /** - * Add an option to the media. This option will be used to determine how the media_player will - * read the media. This allows to use VLC's advanced reading/streaming options on a per-media - * basis. The options are detailed in vlc --long-help, for instance "--sout-all" - * - * @param p_md the media descriptor - * @param ppsz_options the options (as a string) - */ - public static native void libvlc_media_add_option(libvlc_media_t p_md, String ppsz_options); - - /** - * Add an option to the media with configurable flags. This option will be used to determine how - * the media_player will read the media. This allows to use VLC's advanced reading/streaming - * options on a per-media basis. The options are detailed in vlc --long-help, for instance - * "--sout-all" - * - * @param p_md the media descriptor - * @param ppsz_options the options (as a string) - * @param i_flags the flags for this option - */ - public static native void libvlc_media_add_option_flag(libvlc_media_t p_md, String ppsz_options, int i_flags); - - /** - * Retain a reference to a media descriptor object (libvlc_media_t). Use libvlc_media_release() - * to decrement the reference count of a media descriptor object. - * - * @param p_md the media descriptor - */ - public static native void libvlc_media_retain(libvlc_media_t p_md); - - /** - * Decrement the reference count of a media descriptor object. If the reference count is 0, then - * libvlc_media_release() will release the media descriptor object. It will send out an - * libvlc_MediaFreed event to all listeners. If the media descriptor object has been released it - * should not be used again. - * - * @param p_md the media descriptor - */ - public static native void libvlc_media_release(libvlc_media_t p_md); - - /** - * Get the media resource locator (mrl) from a media descriptor object - * - * @param p_md a media descriptor object - * @return string with mrl of media descriptor object - */ - public static native Pointer libvlc_media_get_mrl(libvlc_media_t p_md); - - /** - * Duplicate a media descriptor object. - * - * @param p_md a media descriptor object. - * @return duplicated media descriptor - */ - public static native libvlc_media_t libvlc_media_duplicate(libvlc_media_t p_md); - - /** - * Read the meta of the media. If the media has not yet been parsed this will return NULL. This - * methods automatically calls libvlc_media_parse_async(), so after calling it you may receive a - * libvlc_MediaMetaChanged event. If you prefer a synchronous version ensure that you call - * libvlc_media_parse() before get_meta(). - * - * @see #libvlc_media_parse_with_options(libvlc_media_t, int, int) - * @see #libvlc_media_parse_async(libvlc_media_t) - * @see libvlc_event_e#libvlc_MediaMetaChanged - * @param p_md the media descriptor - * @param e_meta the meta to read - * @return the media's meta - */ - public static native Pointer libvlc_media_get_meta(libvlc_media_t p_md, int e_meta); - - /** - * Set the meta of the media (this function will not save the meta, call libvlc_media_save_meta - * in order to save the meta) - * - * @param p_md the media descriptor - * @param e_meta the meta to write - * @param psz_value the media's meta - */ - public static native void libvlc_media_set_meta(libvlc_media_t p_md, int e_meta, String psz_value); - - /** - * Save the meta previously set - * - * @param p_md the media desriptor - * @return true if the write operation was successfull - */ - public static native int libvlc_media_save_meta(libvlc_media_t p_md); - - /** - * Get current state of media descriptor object. Possible media states are defined in - * libvlc_structures.c (libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Buffering, - * libvlc_Playing, libvlc_Paused, libvlc_Stopped, libvlc_Ended, libvlc_Error). - * - * @param p_meta_desc a media descriptor object - * @return state of media descriptor object - */ - public static native int libvlc_media_get_state(libvlc_media_t p_meta_desc); - - /** - * get the current statistics about the media - * - * @param p_md media descriptor object - * @param p_stats structure that contain the statistics about the media (this structure must be - * allocated by the caller) - * @return true if the statistics are available, false otherwise - */ - public static native int libvlc_media_get_stats(libvlc_media_t p_md, libvlc_media_stats_t p_stats); - - /** - * Get subitems of media descriptor object. This will increment the reference count of supplied - * media descriptor object. Use libvlc_media_list_release() to decrement the reference counting. - * - * @param p_md media descriptor object - * @return list of media descriptor subitems or NULL This method uses libvlc_media_list_t, - * however, media_list usage is optional and this is here for convenience - */ - public static native libvlc_media_list_t libvlc_media_subitems(libvlc_media_t p_md); - - /** - * Get event manager from media descriptor object. NOTE: this function doesn't increment - * reference counting. - * - * @param p_md a media descriptor object - * @return event manager object - */ - public static native libvlc_event_manager_t libvlc_media_event_manager(libvlc_media_t p_md); - - /** - * Get duration (in ms) of media descriptor object item. - * - * @param p_md media descriptor object - * @return duration of media item or -1 on error - */ - public static native long libvlc_media_get_duration(libvlc_media_t p_md); - - /** - * Parse a media. - * - * This fetches (local) art, meta data and tracks information. - * - * The method is the asynchronous of libvlc_media_parse(). To track when this is over you - * can listen to libvlc_MediaParsedChanged event. However if the media was already parsed - * you will not receive this event. - * - * @see #libvlc_media_parse_with_options(libvlc_media_t, int, int) - * @see libvlc_event_e#libvlc_MediaParsedChanged - * @see #libvlc_media_get_meta(libvlc_media_t, int) - * @param media media descriptor object - */ - public static native void libvlc_media_parse_async(libvlc_media_t media); - - /** - * Parse the media asynchronously with options. - * - * This fetches (local or network) art, meta data and/or tracks information. - * - * This method is the extended version of libvlc_media_parse_with_options(). - * - * To track when this is over you can listen to libvlc_MediaParsedChanged - * event. However if this functions returns an error, you will not receive any - * events. - * - * It uses a flag to specify parse options. All - * these flags can be combined. By default, media is parsed if it's a local - * file. - * - * Parsing can be aborted with libvlc_media_parse_stop(). - * - * @see libvlc_event_e#libvlc_MediaParsedChanged - * @see #libvlc_media_get_meta(libvlc_media_t, int) - * @see #libvlc_media_tracks_get(libvlc_media_t, PointerByReference) - * - * @param p_md media descriptor object - * @param parse_flag parse options - * @param timeout maximum time allowed to preparse the media. If -1, the default - * "preparse-timeout" option will be used as a timeout. If 0, it - * will wait indefinitely. If > 0, the timeout will be used (in - * milliseconds). - * @return -1 in case of error, 0 otherwise - * - * @since LibVLC 3.0.0 or later - */ - public static native int libvlc_media_parse_with_options(libvlc_media_t p_md, int parse_flag, int timeout); - - /** - * Stop the parsing of the media - * - * When the media parsing is stopped, the libvlc_MediaParsedChanged event will - * be sent with the libvlc_media_parsed_status_timeout status. - * - * @see #libvlc_media_parse_with_options(libvlc_media_t, int, int) - * - * @param p_md media descriptor object - * - * @since version LibVLC 3.0.0 or later - */ - public static native void libvlc_media_parse_stop(libvlc_media_t p_md); - - /** - * Get Parsed status for media descriptor object. - * - * @param p_md media descriptor object - * @return a value of the libvlc_media_parsed_status_t enum - * - * @since LibVLC 3.0.0 or later - */ - public static native int libvlc_media_get_parsed_status(libvlc_media_t p_md); - - /** - * Sets media descriptor's user_data. user_data is specialized data accessed by the host - * application, VLC.framework uses it as a pointer to an native object that references a - * libvlc_media_t pointer - * - * @param p_md media descriptor object - * @param p_new_user_data pointer to user data - */ - public static native void libvlc_media_set_user_data(libvlc_media_t p_md, Pointer p_new_user_data); - - /** - * Get media descriptor's user_data. user_data is specialized data accessed by the host - * application, VLC.framework uses it as a pointer to an native object that references a - * libvlc_media_t pointer - * - * @param p_md media descriptor object - * @return user-data pointer - */ - public static native Pointer libvlc_media_get_user_data(libvlc_media_t p_md); - - /** - * Get media descriptor's elementary streams description - *
- * Note, you need to parse or play the media at least once before calling this function. - *
- * Not doing this will result in an empty array. - * - * @since LibVLC 2.1.0 and later. - * - * @param p_md media descriptor object - * @param tracks address to store an allocated array of Elementary Streams - * descriptions (must be freed with libvlc_media_tracks_release - * by the caller) [OUT] - * - * @return the number of Elementary Streams (zero on error) - */ - public static native int libvlc_media_tracks_get(libvlc_media_t p_md, PointerByReference tracks); - - /** - * Release media descriptor's elementary streams description array - * - * @since LibVLC 2.1.0 and later. - * - * @param p_tracks tracks info array to release - * @param i_count number of elements in the array - */ - public static native void libvlc_media_tracks_release(Pointer p_tracks, int i_count); - - /** - * Get the media type of the media descriptor object. - * - * @since LibVLC 3.0.0 and later. - * - * @param p_md media descriptor object - * @return media type - */ - public static native int libvlc_media_get_type(libvlc_media_t p_md); - - /** - * Start an asynchronous thumbnail generation - * - * If the request is successfuly queued, the libvlc_MediaThumbnailGenerated - * is guaranteed to be emited. - * - * @param md media descriptor object - * @param time The time at which the thumbnail should be generated - * @param speed The seeking speed \sa{libvlc_thumbnailer_seek_speed_t} - * @param width The thumbnail width - * @param height the thumbnail height - * @param picture_type The thumbnail picture type \sa{libvlc_picture_type_t} - * @param timeout A timeout value in ms, or 0 to disable timeout - * - * @return A valid opaque request object, or NULL in case of failure. - * - * @since libvlc 4.0 or later - * - * @see libvlc_picture_t - */ - public static /*native*/ libvlc_media_thumbnail_request_t libvlc_media_thumbnail_request_by_time(libvlc_media_t md, long time, int speed, int width, int height, int picture_type, long timeout) { - throw new UnsupportedOperationException(); - } - - /** - * Start an asynchronous thumbnail generation - * - * If the request is successfuly queued, the libvlc_MediaThumbnailGenerated - * is guaranteed to be emited. - * - * @param md media descriptor object - * @param pos The position at which the thumbnail should be generated - * @param speed The seeking speed \sa{libvlc_thumbnailer_seek_speed_t} - * @param width The thumbnail width - * @param height the thumbnail height - * @param picture_type The thumbnail picture type \sa{libvlc_picture_type_t} - * @param timeout A timeout value in ms, or 0 to disable timeout - * - * @return A valid opaque request object, or NULL in case of failure. - * - * @since libvlc 4.0 or later - * - * @see libvlc_picture_t - */ - public static /*native*/ libvlc_media_thumbnail_request_t libvlc_media_thumbnail_request_by_pos(libvlc_media_t md, float pos, int speed, int width, int height, int picture_type, long timeout) { - throw new UnsupportedOperationException(); - } - - /** - * Cancels a thumbnailing request - *
- * Cancelling the request will still cause libvlc_MediaThumbnailGenerated event - * to be emitted, with a NULL libvlc_picture_t. - *
- * If the request is cancelled after its completion, the behavior is undefined. - * - * @param p_req An opaque thumbnail request object. - * - */ - public static /*native*/ void libvlc_media_thumbnail_cancel(libvlc_media_thumbnail_request_t p_req) { - throw new UnsupportedOperationException(); - } - - /** - * Get codec description from media elementary stream. - * - * @param i_type i_type from libvlc_media_track_t - * @param i_codec i_codec or i_original_fourcc from libvlc_media_track_t - * - * @return codec description - * - * @since LibVLC 3.0.0 and later. - */ - public static native String libvlc_media_get_codec_description(int i_type, int i_codec); - - /** - * Add a slave to the current media. - *
- * A slave is an external input source that may contains an additional subtitle - * track (like a .srt) or an additional audio track (like a .ac3). - *
- * This function must be called before the media is parsed (via - * libvlc_media_parse_with_options()) or before the media is played (via - * libvlc_media_player_play()) - * - * @param p_md media descriptor object - * @param i_type subtitle or audio - * @param i_priority from 0 (low priority) to 4 (high priority) - * @param psz_uri Uri of the slave (should contain a valid scheme). - * @return 0 on success, -1 on error. - * - * @since LibVLC 3.0.0 and later. - */ - public static native int libvlc_media_slaves_add(libvlc_media_t p_md, int i_type, int i_priority, String psz_uri); - - /** - * Clear all slaves previously added by libvlc_media_slaves_add() or - * internally. - * - * @param p_md media descriptor object - * - * @since LibVLC 3.0.0 and later. - */ - public static native void libvlc_media_slaves_clear(libvlc_media_t p_md); - - /** - * Get a media descriptor's slave list - * - * The list will contain slaves parsed by VLC or previously added by - * libvlc_media_slaves_add(). The typical use case of this function is to save - * a list of slave in a database for a later use. - * - * @param p_md media descriptor object - * @param ppp_slaves address to store an allocated array of slaves (must be freed with libvlc_media_slaves_release()) [OUT] - * - * @return the number of slaves (zero on error) - * @since LibVLC 3.0.0 and later. - */ - public static native int libvlc_media_slaves_get(libvlc_media_t p_md, PointerByReference ppp_slaves); - - /** - * Release a media descriptor's slave list - * - * @since LibVLC 3.0.0 and later. - * - * @param pp_slaves slave array to release - * @param i_count number of elements in the array - */ - public static native void libvlc_media_slaves_release(Pointer pp_slaves, int i_count); - - // === libvlc_media.h ======================================================= - - // === libvlc_media_player.h ================================================ - - /** - * Create an empty Media Player object - * - * @param p_libvlc_instance the libvlc instance in which the Media Player should be created. - * @return a new media player object, or NULL on error. - */ - public static native libvlc_media_player_t libvlc_media_player_new(libvlc_instance_t p_libvlc_instance); - - /** - * Create a Media Player object from a Media - * - * @param p_md the media. Afterwards the p_md can be safely destroyed. - * @return a new media player object, or NULL on error. - */ - public static native libvlc_media_player_t libvlc_media_player_new_from_media(libvlc_media_t p_md); - - /** - * Release a media_player after use Decrement the reference count of a media player object. If - * the reference count is 0, then libvlc_media_player_release() will release the media player - * object. If the media player object has been released, then it should not be used again. - * - * @param p_mi the Media Player to free - */ - public static native void libvlc_media_player_release(libvlc_media_player_t p_mi); - - /** - * Retain a reference to a media player object. Use libvlc_media_player_release() to decrement - * reference count. - * - * @param p_mi media player object - */ - public static native void libvlc_media_player_retain(libvlc_media_player_t p_mi); - - /** - * Set the media that will be used by the media_player. If any, previous md will be released. - * - * @param p_mi the Media Player - * @param p_md the Media. Afterwards the p_md can be safely destroyed. - */ - public static native void libvlc_media_player_set_media(libvlc_media_player_t p_mi, libvlc_media_t p_md); - - /** - * Get the media used by the media_player. - *
- * You do not need to invoke libvlc_media_player_release(). - * - * @param p_mi the Media Player - * @return the media associated with p_mi, or NULL if no media is associated - */ - public static native libvlc_media_t libvlc_media_player_get_media(libvlc_media_player_t p_mi); - - /** - * Get the Event Manager from which the media player send event. - * - * @param p_mi the Media Player - * @return the event manager associated with p_mi - */ - public static native libvlc_event_manager_t libvlc_media_player_event_manager(libvlc_media_player_t p_mi); - - /** - * is_playing - * - * @param p_mi the Media Player - * @return 1 if the media player is playing, 0 otherwise - */ - public static native int libvlc_media_player_is_playing(libvlc_media_player_t p_mi); - - /** - * Play - * - * @param p_mi the Media Player - * @return 0 if playback started (and was already started), or -1 on error. - */ - public static native int libvlc_media_player_play(libvlc_media_player_t p_mi); - - /** - * Pause or resume (no effect if there is no media) - * - * @param mp the Media Player - * @param do_pause play/resume if zero, pause if non-zero - * @since LibVLC 1.1.1 - */ - public static native void libvlc_media_player_set_pause(libvlc_media_player_t mp, int do_pause); - - /** - * Toggle pause (no effect if there is no media) - * - * @param p_mi the Media Player - */ - public static native void libvlc_media_player_pause(libvlc_media_player_t p_mi); - - /** - * Stop (no effect if there is no media) - * - * @param p_mi the Media Player - */ - public static native void libvlc_media_player_stop(libvlc_media_player_t p_mi); - - /** - * Set a renderer to the media player - * - * Must be called before the first call of libvlc_media_player_play() to - * take effect. - * - * @see #libvlc_renderer_discoverer_new(libvlc_instance_t, String) - * - * @param p_mi the Media Player - * @param p_item an item discovered by libvlc_renderer_discoverer_start() - * @return 0 on success, -1 on error. - * - * @since LibVLC 3.0.0 or later - */ - public static native int libvlc_media_player_set_renderer(libvlc_media_player_t p_mi, libvlc_renderer_item_t p_item); - - /** - * Set callbacks and private data to render decoded video to a custom area in memory. - *
- * Use libvlc_video_set_format() or libvlc_video_set_format_callbacks() to configure the decoded - * format. - * - * @param mp the media player - * @param lock callback to allocate video memory - * @param unlock callback to release video memory - * @param display callback when ready to display a video frame - * @param opaque private pointer for the three callbacks (as first parameter) - * @since LibVLC 1.1.1 - */ - public static native void libvlc_video_set_callbacks(libvlc_media_player_t mp, libvlc_lock_callback_t lock, libvlc_unlock_callback_t unlock, libvlc_display_callback_t display, Pointer opaque); - - /** - * Set decoded video chroma and dimensions. - *
- * This only works in combination with libvlc_video_set_callbacks(), and is mutually exclusive - * with libvlc_video_set_format_callbacks(). - * - * @param mp the media player - * @param chroma a four-characters string identifying the chroma (e.g. "RV32" or "YUYV") - * @param width pixel width - * @param height pixel height - * @param pitch line pitch (in bytes) - * @since LibVLC 1.1.1 - * - * bug: All pixel planes are expected to have the same pitch. To use the YCbCr color space with - * chrominance subsampling, consider using libvlc_video_set_format_callback() instead. - */ - public static native void libvlc_video_set_format(libvlc_media_player_t mp, String chroma, int width, int height, int pitch); - - /** - * Set decoded video chroma and dimensions. This only works in combination with - * libvlc_video_set_callbacks(). - * - * @param mp the media player - * @param setup callback to select the video format (cannot be NULL) - * @param cleanup callback to release any allocated resources (or NULL) - * @since LibVLC 2.0.0 or later - */ - public static native void libvlc_video_set_format_callbacks(libvlc_media_player_t mp, libvlc_video_format_cb setup, libvlc_video_cleanup_cb cleanup); - - /** - * Set the NSView handler where the media player should render its video output. Use the vout - * called "macosx". The drawable is an NSObject that follow the VLCOpenGLVideoViewEmbedding - * protocol: - *
- * \@protocol VLCOpenGLVideoViewEmbedding <NSObject> - (void)addVoutSubview:(NSView*)view; - (void)removeVoutSubview:(NSView *)view; \@end - *- * Or it can be an NSView object. If you want to use it along with Qt4 see the - * QMacCocoaViewContainer. Then the following code should work: - *
- * {
- * NSView *video = [[NSView alloc] init];
- * QMacCocoaViewContainer *container = new QMacCocoaViewContainer(video, parent);
- * libvlc_media_player_set_nsobject(mp, video);
- * [video release];
- * }
- *
- * You can find a live example in VLCVideoView in VLCKit.framework.
- *
- * @param p_mi the Media Player
- * @param drawable the drawable that is either an NSView or an object following the
- * VLCOpenGLVideoViewEmbedding protocol.
- */
- public static native void libvlc_media_player_set_nsobject(libvlc_media_player_t p_mi, long drawable);
-
- /**
- * Get the NSView handler previously set with libvlc_media_player_set_nsobject().
- *
- * @param p_mi the Media Player
- * @return the NSView handler or 0 if none where set
- */
- public static native Pointer libvlc_media_player_get_nsobject(libvlc_media_player_t p_mi);
-
- /**
- * Set an X Window System drawable where the media player should render its video output. If
- * LibVLC was built without X11 output support, then this has no effects. The specified
- * identifier must correspond to an existing Input/Output class X11 window. Pixmaps are
- * not supported. The caller shall ensure that the X11 server is the same as the one the
- * VLC instance has been configured with.
- *
- * @param p_mi the Media Player
- * @param drawable the ID of the X window
- */
- public static native void libvlc_media_player_set_xwindow(libvlc_media_player_t p_mi, int drawable);
-
- /**
- * Get the X Window System window identifier previously set with
- * libvlc_media_player_set_xwindow(). Note that this will return the identifier even if VLC is
- * not currently using it (for instance if it is playing an audio-only input).
- *
- * @param p_mi the Media Player
- * @return an X window ID, or 0 if none where set.
- */
- public static native int libvlc_media_player_get_xwindow(libvlc_media_player_t p_mi);
-
- /**
- * Set a Win32/Win64 API window handle (HWND) where the media player should render its video
- * output. If LibVLC was built without Win32/Win64 API output support, then this has no effects.
- *
- * @param p_mi the Media Player
- * @param drawable windows handle of the drawable
- */
- public static native void libvlc_media_player_set_hwnd(libvlc_media_player_t p_mi, Pointer drawable);
-
- /**
- * Get the Windows API window handle (HWND) previously set with libvlc_media_player_set_hwnd().
- * The handle will be returned even if LibVLC is not currently outputting any video to it.
- *
- * @param p_mi the Media Player
- * @return a window handle or NULL if there are none.
- */
- public static native Pointer libvlc_media_player_get_hwnd(libvlc_media_player_t p_mi);
-
- /**
- * Set callbacks and private data for decoded audio.
- * - * Use libvlc_audio_set_format() or libvlc_audio_set_format_callbacks() to configure the decoded - * audio format. - * - * @param mp the media player - * @param play callback to play audio samples (must not be NULL) - * @param pause callback to pause playback (or NULL to ignore) - * @param resume callback to resume playback (or NULL to ignore) - * @param flush callback to flush audio buffers (or NULL to ignore) - * @param drain callback to drain audio buffers (or NULL to ignore) - * @param opaque private pointer for the audio callbacks (as first parameter) - * @since LibVLC 2.0.0 or later - */ - public static native void libvlc_audio_set_callbacks(libvlc_media_player_t mp, libvlc_audio_play_cb play, libvlc_audio_pause_cb pause, libvlc_audio_resume_cb resume, libvlc_audio_flush_cb flush, libvlc_audio_drain_cb drain, Pointer opaque); - - /** - * Set callbacks and private data for decoded audio. Use libvlc_audio_set_format() or - * libvlc_audio_set_format_callbacks() to configure the decoded audio format. - * - * @param mp the media player - * @param set_volume callback to apply audio volume, or NULL to apply volume in software - * @since LibVLC 2.0.0 or later - */ - public static native void libvlc_audio_set_volume_callback(libvlc_media_player_t mp, libvlc_audio_set_volume_cb set_volume); - - /** - * Set decoded audio format. This only works in combination with libvlc_audio_set_callbacks(). - * - * @param mp the media player - * @param setup callback to select the audio format (cannot be NULL) - * @param cleanup callback to release any allocated resources (or NULL) - * @since LibVLC 2.0.0 or later - */ - public static native void libvlc_audio_set_format_callbacks(libvlc_media_player_t mp, libvlc_audio_setup_cb setup, libvlc_audio_cleanup_cb cleanup); - - /** - * Set decoded audio format. This only works in combination with libvlc_audio_set_callbacks(), - * and is mutually exclusive with libvlc_audio_set_format_callbacks(). - * - * @param mp the media player - * @param format a four-characters string identifying the sample format (e.g. "S16N" or "f32l") - * @param rate sample rate (expressed in Hz) - * @param channels channels count - * @since LibVLC 2.0.0 or later - */ - public static native void libvlc_audio_set_format(libvlc_media_player_t mp, String format, int rate, int channels); - - /** bug This might go away ... to be replaced by a broader system */ - - /** - * Get the current movie length (in ms). - * - * @param p_mi the Media Player - * @return the movie length (in ms), or -1 if there is no media. - */ - public static native long libvlc_media_player_get_length(libvlc_media_player_t p_mi); - - /** - * Get the current movie time (in ms). - * - * @param p_mi the Media Player - * @return the movie time (in ms), or -1 if there is no media. - */ - public static native long libvlc_media_player_get_time(libvlc_media_player_t p_mi); - - /** - * Set the movie time (in ms). - *
- * This has no effect if no media is being played. - *
- * Not all formats and protocols support this. - * - * @param p_mi the Media Player - * @param i_time the movie time (in ms). - */ - public static native void libvlc_media_player_set_time(libvlc_media_player_t p_mi, long i_time); - - /** - * Get movie position. - * - * @param p_mi the Media Player - * @return movie position, or -1. in case of error - */ - public static native float libvlc_media_player_get_position(libvlc_media_player_t p_mi); - - /** - * Set movie position as percentage between 0.0 and 1.0. - *
- * This has no effect if playback is not enabled. - *
- * This might not work depending on the underlying input format and protocol. - * - * @param p_mi the Media Player - * @param f_pos the position - */ - public static native void libvlc_media_player_set_position(libvlc_media_player_t p_mi, float f_pos); - - /** - * Set movie chapter (if applicable). - * - * @param p_mi the Media Player - * @param i_chapter chapter number to play - */ - public static native void libvlc_media_player_set_chapter(libvlc_media_player_t p_mi, int i_chapter); - - /** - * Get movie chapter. - * - * @param p_mi the Media Player - * @return chapter number currently playing, or -1 if there is no media. - */ - public static native int libvlc_media_player_get_chapter(libvlc_media_player_t p_mi); - - /** - * Get movie chapter count - * - * @param p_mi the Media Player - * @return number of chapters in movie, or -1. - */ - public static native int libvlc_media_player_get_chapter_count(libvlc_media_player_t p_mi); - - /** - * Is the player able to play - * - * @param p_mi the Media Player - * @return boolean - */ - public static native int libvlc_media_player_will_play(libvlc_media_player_t p_mi); - - /** - * Get title chapter count - * - * @param p_mi the Media Player - * @param i_title title - * @return number of chapters in title, or -1 - */ - public static native int libvlc_media_player_get_chapter_count_for_title(libvlc_media_player_t p_mi, int i_title); - - /** - * Set movie title - * - * @param p_mi the Media Player - * @param i_title title number to play - */ - public static native void libvlc_media_player_set_title(libvlc_media_player_t p_mi, int i_title); - - /** - * Get movie title - * - * @param p_mi the Media Player - * @return title number currently playing, or -1 - */ - public static native int libvlc_media_player_get_title(libvlc_media_player_t p_mi); - - /** - * Get movie title count - * - * @param p_mi the Media Player - * @return title number count, or -1 - */ - public static native int libvlc_media_player_get_title_count(libvlc_media_player_t p_mi); - - /** - * Set previous chapter (if applicable) - * - * @param p_mi the Media Player - */ - public static native void libvlc_media_player_previous_chapter(libvlc_media_player_t p_mi); - - /** - * Set next chapter (if applicable) - * - * @param p_mi the Media Player - */ - public static native void libvlc_media_player_next_chapter(libvlc_media_player_t p_mi); - - /** - * Get the requested movie play rate. - *
- * Depending on the underlying media, the requested rate may be different from the real - * playback rate. - * @param p_mi the Media Player - * @return movie play rate - */ - public static native float libvlc_media_player_get_rate(libvlc_media_player_t p_mi); - - /** - * Set movie play rate - * - * @param p_mi the Media Player - * @param rate movie play rate to set - * @return -1 if an error was detected, 0 otherwise (but even then, it might not actually work - * depending on the underlying media protocol) - */ - public static native int libvlc_media_player_set_rate(libvlc_media_player_t p_mi, float rate); - - /** - * Get current movie state - * - * @param p_mi the Media Player - * @return the current state of the media player (playing, paused, ...) @see State - */ - public static native int libvlc_media_player_get_state(libvlc_media_player_t p_mi); - - /** - * How many video outputs does this media player have? - * - * @param p_mi the media player - * @return the number of video outputs - */ - public static native int libvlc_media_player_has_vout(libvlc_media_player_t p_mi); - - /** - * Is this media player seekable? - * - * @param p_mi the media player - * @return true if the media player can seek - */ - public static native int libvlc_media_player_is_seekable(libvlc_media_player_t p_mi); - - /** - * Can this media player be paused? - * - * @param p_mi the media player - * @return true if the media player can pause - */ - public static native int libvlc_media_player_can_pause(libvlc_media_player_t p_mi); - - /** - * Is the current program scrambled? - * - * @param p_mi the media player - * @return true if the current program is scrambled - * @since libVLC 2.2.0 - */ - public static native int libvlc_media_player_program_scrambled(libvlc_media_player_t p_mi); - - /** - * Display the next frame (if supported) - * - * @param p_mi the media player - */ - public static native void libvlc_media_player_next_frame(libvlc_media_player_t p_mi); - - /** - * Navigate through DVD Menu - * - * @param p_mi the Media Player - * @param navigate the Navigation mode - * @since libVLC 2.0.0 - */ - public static native void libvlc_media_player_navigate(libvlc_media_player_t p_mi, int navigate); - - /** - * Set if, and how, the video title will be shown when media is played. - * - * @param p_mi the media player - * @param position position at which to display the title, or libvlc_position_disable to prevent the title from being displayed - * @param timeout title display timeout in milliseconds (ignored if libvlc_position_disable) - * @since libVLC 2.1.0 or later - */ - public static native void libvlc_media_player_set_video_title_display(libvlc_media_player_t p_mi, int position, int timeout); - - /** - * Add a slave to the current media player. - * - * If the player is playing, the slave will be added directly. This call - * will also update the slave list of the attached libvlc_media_t. - * - * @see #libvlc_media_slaves_add(libvlc_media_t, int, int, String) - * - * @param p_mi the media player - * @param i_type subtitle or audio - * @param psz_uri Uri of the slave (should contain a valid scheme). - * @param b_select True if this slave should be selected when it's loaded - * - * @return 0 on success, -1 on error. - * @since LibVLC 3.0.0 and later. - */ - public static native int libvlc_media_player_add_slave(libvlc_media_player_t p_mi, int i_type, String psz_uri, int b_select); - - /** - * Release (free) libvlc_track_description_t - * - * @param p_track_description the structure to release - */ - public static native void libvlc_track_description_list_release(Pointer p_track_description); - - /** - * Toggle fullscreen status on non-embedded video outputs. - *
- * The same limitations applies to this function as to libvlc_set_fullscreen(). - * - * @param p_mi the media player - */ - public static native void libvlc_toggle_fullscreen(libvlc_media_player_t p_mi); - - /** - * Enable or disable fullscreen. - *
- * With most window managers, only a top-level windows can be in full-screen mode. - * Hence, this function will not operate properly if libvlc_media_player_set_xid() was - * used to embed the video in a non-top-level window. In that case, the embedding - * window must be reparented to the root window before fullscreen mode is - * enabled. You will want to reparent it back to its normal parent when disabling - * fullscreen. - * - * @param p_mi the media player - * @param b_fullscreen boolean for fullscreen status - */ - public static native void libvlc_set_fullscreen(libvlc_media_player_t p_mi, int b_fullscreen); - - /** - * Get current fullscreen status. - * - * @param p_mi the media player - * @return the fullscreen status (boolean) - */ - public static native int libvlc_get_fullscreen(libvlc_media_player_t p_mi); - - /** - * Enable or disable key press events handling, according to the LibVLC hotkeys configuration. - * By default and for historical reasons, keyboard events are handled by the LibVLC video - * widget. - *
- * On X11, there can be only one subscriber for key press and mouse click events - * per window. If your application has subscribed to those events for the X window ID of the - * video widget, then LibVLC will not be able to handle key presses and mouse clicks in any - * case. - *
- * This function is only implemented for X11 and Win32 at the moment. - * - * @param p_mi the media player - * @param on true to handle key press events, false to ignore them. - */ - public static native void libvlc_video_set_key_input(libvlc_media_player_t p_mi, int on); - - /** - * Enable or disable mouse click events handling. By default, those events are handled. This is - * needed for DVD menus to work, as well as a few video filters such as "puzzle". - *
- * See also libvlc_video_set_key_input(). - *
- * This function is only implemented for X11 and Win32 at the moment. - * - * @param p_mi the media player - * @param on true to handle mouse click events, false to ignore them. - */ - public static native void libvlc_video_set_mouse_input(libvlc_media_player_t p_mi, int on); - - /** - * Get the pixel dimensions of a video. - * - * @param p_mi media player - * @param num number of the video (starting from, and most commonly 0) - * @param px pointer to get the pixel width [OUT] - * @param py pointer to get the pixel height [OUT] - * @return 0 on success, -1 if the specified video does not exist - */ - public static native int libvlc_video_get_size(libvlc_media_player_t p_mi, int num, IntByReference px, IntByReference py); - - /** - * Get the mouse pointer coordinates over a video. Coordinates are expressed in terms of the - * decoded video resolution, not in terms of pixels on the screen/viewport (to get the - * latter, you can query your windowing system directly). Either of the coordinates may be - * negative or larger than the corresponding dimension of the video, if the cursor is outside - * the rendering area. - *
- * The coordinates may be out-of-date if the pointer is not located on the video - * rendering area. LibVLC does not track the pointer if it is outside of the video - * widget. - *
- * LibVLC does not support multiple pointers (it does of course support multiple input - * devices sharing the same pointer) at the moment. - * - * @param p_mi media player - * @param num number of the video (starting from, and most commonly 0) - * @param px pointer to get the abscissa [OUT] - * @param py pointer to get the ordinate [OUT] - * @return 0 on success, -1 if the specified video does not exist - */ - public static native int libvlc_video_get_cursor(libvlc_media_player_t p_mi, int num, Pointer px, Pointer py); - - /** - * Get the current video scaling factor. See also libvlc_video_set_scale(). - * - * @param p_mi the media player - * @return the currently configured zoom factor, or 0. if the video is set to fit to the output - * window/drawable automatically. - */ - public static native float libvlc_video_get_scale(libvlc_media_player_t p_mi); - - /** - * Set the video scaling factor. That is the ratio of the number of pixels on screen to the - * number of pixels in the original decoded video in each dimension. Zero is a special value; it - * will adjust the video to the output window/drawable (in windowed mode) or the entire screen. - * Note that not all video outputs support scaling. - * - * @param p_mi the media player - * @param f_factor the scaling factor, or zero - */ - public static native void libvlc_video_set_scale(libvlc_media_player_t p_mi, float f_factor); - - /** - * Get current video aspect ratio. - * - * @param p_mi the media player - * @return the video aspect ratio or NULL if unspecified (the result must be released with - * free()). - */ - public static native Pointer libvlc_video_get_aspect_ratio(libvlc_media_player_t p_mi); - - /** - * Set new video aspect ratio. - * - * Note: invalid aspect ratios are ignored. - * - * @param p_mi the media player - * @param psz_aspect new video aspect-ratio or NULL to reset to default - */ - public static native void libvlc_video_set_aspect_ratio(libvlc_media_player_t p_mi, String psz_aspect); - - /** - * Create a video viewpoint structure. - * - * @return video viewpoint or NULL (the result must be released with free() or libvlc_free()). - * @since LibVLC 3.0.0 and later - */ - public static native libvlc_video_viewpoint_t libvlc_video_new_viewpoint(); - - /** - * Update the video viewpoint information. - *
- * It is safe to call this function before the media player is started. - *
- * The values are set asynchronously, it will be used by the next frame displayed. - * - * @param p_mi the media player - * @param p_viewpoint video viewpoint allocated via libvlc_video_new_viewpoint() - * @param b_absolute if true replace the old viewpoint with the new one. If false, increase/decrease it. - * @return -1 in case of error, 0 otherwise - * - * @since LibVLC 3.0.0 and later - */ - public static native int libvlc_video_update_viewpoint(libvlc_media_player_t p_mi, libvlc_video_viewpoint_t p_viewpoint, int b_absolute); - - /** - * Get current video subtitle. - * - * @param p_mi the media player - * @return the video subtitle selected, or -1 if none - */ - public static native int libvlc_video_get_spu(libvlc_media_player_t p_mi); - - /** - * Get the number of available video subtitles. - * - * @param p_mi the media player - * @return the number of available video subtitles - */ - public static native int libvlc_video_get_spu_count(libvlc_media_player_t p_mi); - - /** - * Get the description of available video subtitles. - * - * @param p_mi the media player - * @return list containing description of available video subtitles - */ - public static native libvlc_track_description_t libvlc_video_get_spu_description(libvlc_media_player_t p_mi); - - /** - * Set new video subtitle. - * - * @param p_mi the media player - * @param i_spu new video subtitle to select - * @return 0 on success, -1 if out of range - */ - public static native int libvlc_video_set_spu(libvlc_media_player_t p_mi, int i_spu); - - /** - * Get the current subtitle delay. Positive values means subtitles are being displayed later, - * negative values earlier. - * - * @param p_mi media player - * @return time (in microseconds) the display of subtitles is being delayed - * @since LibVLC 2.0.0 or later - */ - public static native long libvlc_video_get_spu_delay(libvlc_media_player_t p_mi); - - /** - * Set the subtitle delay. This affects the timing of when the subtitle will be displayed. - * Positive values result in subtitles being displayed later, while negative values will result - * in subtitles being displayed earlier. - * - * The subtitle delay will be reset to zero each time the media changes. - * - * @param p_mi media player - * @param i_delay time (in microseconds) the display of subtitles should be delayed - * @return 0 on success, -1 on error - * @since LibVLC 2.0.0 or later - */ - public static native int libvlc_video_set_spu_delay(libvlc_media_player_t p_mi, long i_delay); - - /** - * Get the full description of available titles - * - * @since LibVLC 3.0.0 and later. - * - * @param p_mi the media player - * @param titles address to store an allocated array of title descriptions - * descriptions (must be freed with libvlc_title_descriptions_release() - * by the caller) [OUT] - * - * @return the number of titles (-1 on error) - */ - public static native int libvlc_media_player_get_full_title_descriptions(libvlc_media_player_t p_mi, PointerByReference titles); - - /** - * Release title descriptions. - * - * @param p_titles title description array to release - * @param i_count number of title descriptions to release - * - * @since LibVLC 3.0.0 and later - */ - public static native void libvlc_title_descriptions_release(Pointer p_titles, int i_count); - - /** - * Get the full description of available chapters. - * - * @param p_mi the media player - * @param i_chapters_of_title index of the title to query for chapters (uses current title if set to -1) - * @param pp_chapters address to store an allocated array of chapter descriptions - * descriptions (must be freed with libvlc_chapter_descriptions_release() - * by the caller) [OUT] - * - * @return the number of chapters (-1 on error) - * - * @since LibVLC 3.0.0 and later. - */ - public static native int libvlc_media_player_get_full_chapter_descriptions(libvlc_media_player_t p_mi, int i_chapters_of_title, PointerByReference pp_chapters); - - /** - * Release chapter descriptions. - * - * @param p_chapters chapter description array to release - * @param i_count number of chapter descriptions to release - * - * @since LibVLC 3.0.0 and later - */ - public static native void libvlc_chapter_descriptions_release(Pointer p_chapters, int i_count); - - /** - * Get current crop filter geometry. - * - * @param p_mi the media player - * @return the crop filter geometry or NULL if unset - */ - public static native Pointer libvlc_video_get_crop_geometry(libvlc_media_player_t p_mi); - - /** - * Set new crop filter geometry. - * - * @param p_mi the media player - * @param psz_geometry new crop filter geometry (NULL to unset) - */ - public static native void libvlc_video_set_crop_geometry(libvlc_media_player_t p_mi, String psz_geometry); - - /** - * Get current teletext page requested or 0 if it's disabled. - * - * @param p_mi the media player - * @return the current teletext page requested. - */ - public static native int libvlc_video_get_teletext(libvlc_media_player_t p_mi); - - /** - * Set new teletext page to retrieve. - * - * @param p_mi the media player - * @param i_page teletex page number requested. - * This value can be 0 to disable teletext or a number in the range 0 to 1000 to show the requested - * page or a TeletextKey. 100 is the default teletext page. - */ - public static native void libvlc_video_set_teletext(libvlc_media_player_t p_mi, int i_page); - - /** - * Get number of available video tracks. - * - * @param p_mi media player - * @return the number of available video tracks (int) - */ - public static native int libvlc_video_get_track_count(libvlc_media_player_t p_mi); - - /** - * Get the description of available video tracks. - * - * @param p_mi media player - * @return list with description of available video tracks, or NULL on error - */ - public static native libvlc_track_description_t libvlc_video_get_track_description(libvlc_media_player_t p_mi); - - /** - * Get current video track. - * - * @param p_mi media player - * @return the video track ID (int) or -1 if no active input - */ - public static native int libvlc_video_get_track(libvlc_media_player_t p_mi); - - /** - * Set video track. - * - * @param p_mi media player - * @param i_track the track ID (i_id field from track description) - * @return 0 on success, -1 if out of range - */ - public static native int libvlc_video_set_track(libvlc_media_player_t p_mi, int i_track); - - /** - * Take a snapshot of the current video window. If i_width AND i_height is 0, original size is - * used. If i_width XOR i_height is 0, original aspect-ratio is preserved. - * - * @param p_mi media player instance - * @param num number of video output (typically 0 for the first/only one) - * @param psz_filepath the path where to save the screenshot to - * @param i_width the snapshot's width - * @param i_height the snapshot's height - * @return 0 on success, -1 if the video was not found - */ - public static native int libvlc_video_take_snapshot(libvlc_media_player_t p_mi, int num, String psz_filepath, int i_width, int i_height); - - /** - * Enable or disable deinterlace filter - * - * @param p_mi libvlc media player - * @param psz_mode type of deinterlace filter, NULL to disable - */ - public static native void libvlc_video_set_deinterlace(libvlc_media_player_t p_mi, String psz_mode); - - /** - * Get an integer marquee option value - * - * @param p_mi libvlc media player - * @param option marq option to get @see libvlc_video_marquee_int_option_t - * @return marquee option value - */ - public static native int libvlc_video_get_marquee_int(libvlc_media_player_t p_mi, int option); - - /** - * Get a string marquee option value - * - * @param p_mi libvlc media player - * @param option marq option to get @see libvlc_video_marquee_string_option_t - * @return marquee option value - */ - public static native Pointer libvlc_video_get_marquee_string(libvlc_media_player_t p_mi, int option); - - /** - * Enable, disable or set an integer marquee option Setting libvlc_marquee_Enable has the side - * effect of enabling (arg !0) or disabling (arg 0) the marq filter. - * - * @param p_mi libvlc media player - * @param option marq option to set @see libvlc_video_marquee_int_option_t - * @param i_val marq option value - */ - public static native void libvlc_video_set_marquee_int(libvlc_media_player_t p_mi, int option, int i_val); - - /** - * Set a marquee string option - * - * @param p_mi libvlc media player - * @param option marq option to set @see libvlc_video_marquee_string_option_t - * @param psz_text marq option value - */ - public static native void libvlc_video_set_marquee_string(libvlc_media_player_t p_mi, int option, String psz_text); - - /** - * Get integer logo option. - * - * @param p_mi libvlc media player instance - * @param option logo option to get, values of libvlc_video_logo_option_t - * @return logo option value - */ - public static native int libvlc_video_get_logo_int(libvlc_media_player_t p_mi, int option); - - /** - * Set logo option as integer. Options that take a different type value are ignored. Passing - * libvlc_logo_enable as option value has the side effect of starting (arg !0) or stopping (arg - * 0) the logo filter. - * - * @param p_mi libvlc media player instance - * @param option logo option to set, values of libvlc_video_logo_option_t - * @param value logo option value - */ - public static native void libvlc_video_set_logo_int(libvlc_media_player_t p_mi, int option, int value); - - /** - * Set logo option as string. Options that take a different type value are ignored. - * - * @param p_mi libvlc media player instance - * @param option logo option to set, values of libvlc_video_logo_option_t - * @param psz_value logo option value - */ - public static native void libvlc_video_set_logo_string(libvlc_media_player_t p_mi, int option, String psz_value); - - /** - * Get integer adjust option. - * - * @param p_mi libvlc media player instance - * @param option adjust option to get, values of libvlc_video_adjust_option_t - * @return value - * @since LibVLC 1.1.1 - */ - public static native int libvlc_video_get_adjust_int(libvlc_media_player_t p_mi, int option); - - /** - * Set adjust option as integer. Options that take a different type value are ignored. Passing - * libvlc_adjust_enable as option value has the side effect of starting (arg !0) or stopping - * (arg 0) the adjust filter. - * - * @param p_mi libvlc media player instance - * @param option adust option to set, values of libvlc_video_adjust_option_t - * @param value adjust option value - * @since LibVLC 1.1.1 - */ - public static native void libvlc_video_set_adjust_int(libvlc_media_player_t p_mi, int option, int value); - - /** - * Get float adjust option. - * - * @param p_mi libvlc media player instance - * @param option adjust option to get, values of libvlc_video_adjust_option_t - * @return value - * @since LibVLC 1.1.1 - */ - public static native float libvlc_video_get_adjust_float(libvlc_media_player_t p_mi, int option); - - /** - * Set adjust option as float. Options that take a different type value are ignored. - * - * @param p_mi libvlc media player instance - * @param option adust option to set, values of libvlc_video_adjust_option_t - * @param value adjust option value - * @since LibVLC 1.1.1 - */ - public static native void libvlc_video_set_adjust_float(libvlc_media_player_t p_mi, int option, float value); - - /** - * Gets the list of available audio outputs - * - * @param p_instance libvlc instance - * @return list of available audio outputs. It must be freed it with - * {@link #libvlc_audio_output_list_release(Pointer)}. In case of error, - * NULL is returned. - */ - public static native libvlc_audio_output_t libvlc_audio_output_list_get(libvlc_instance_t p_instance); - - /** - * Frees the list of available audio outputs - * - * @param p_list list with audio outputs for release - */ - public static native void libvlc_audio_output_list_release(Pointer p_list); - - /** - * Sets the audio output. - *
- * Note: Any change will take be effect only after playback is stopped and - * restarted. Audio output cannot be changed while playing. - * - * @param p_mi media player - * @param psz_name name of audio output, use psz_name of @see libvlc_audio_output_t - * @return 0 if function succeded, -1 on error - */ - public static native int libvlc_audio_output_set(libvlc_media_player_t p_mi, String psz_name); - - /** - * Gets a list of potential audio output devices, see - * {@link #libvlc_audio_output_device_set(libvlc_media_player_t, String, String)}. - *
- * Not all audio outputs support enumerating devices. The audio output may be functional - * even if the list is empty (NULL). - *
- * The list may not be exhaustive. - *
- * Some audio output devices in the list might not actually work in some circumstances. - * By default, it is recommended to not specify any explicit audio device. - * - * @param mp media player - * @return NULL-terminated linked list of potential audio output devices. It must be freed - * with {@link #libvlc_audio_output_device_list_release(Pointer)}. - * @since LibVLC 2.2.0 or later. - */ - public static native libvlc_audio_output_device_t libvlc_audio_output_device_enum(libvlc_media_player_t mp); - - /** - * Gets a list of audio output devices for a given audio output. - *
- * See {@link #libvlc_audio_output_device_set(libvlc_media_player_t, String, String)}. - *
- * Not all audio outputs support this. In particular, an empty (NULL) - * list of devices does not imply that the specified audio output does - * not work. - *
- * The list might not be exhaustive. - *
- * Some audio output devices in the list might not actually work in some - * circumstances. By default, it is recommended to not specify any explicit - * audio device. - * - * @param p_instance libvlc instance - * @param psz_aout audio output name (as returned by libvlc_audio_output_list_get()) - * @return A NULL-terminated linked list of potential audio output devices. It must be freed it with libvlc_audio_output_device_list_release() - * @since LibVLC 2.1.0 or later. - */ - public static native libvlc_audio_output_device_t libvlc_audio_output_device_list_get( libvlc_instance_t p_instance, String psz_aout ); - - /** - * Frees a list of available audio output devices. - * - * @param p_list list with audio outputs for release - * @since LibVLC 2.1.0 or later. - */ - public static native void libvlc_audio_output_device_list_release(Pointer p_list); - - /** - * Configures an explicit audio output device. - *
- * If the module parameter is NULL, audio output will be moved to the device - * specified by the device identifier string immediately. This is the - * recommended usage. - *
- * A list of adequate potential device strings can be obtained with - * libvlc_audio_output_device_enum(). - *
- * However passing NULL is supported in LibVLC version 2.2.0 and later only; - * in earlier versions, this function would have no effects when the module - * parameter was NULL. - *
- * If the module parameter is not NULL, the device parameter of the - * corresponding audio output, if it exists, will be set to the specified - * string. Note that some audio output modules do not have such a parameter - * (notably MMDevice and PulseAudio). - *
- * A list of adequate potential device strings can be obtained with - * libvlc_audio_output_device_list_get(). - *
- * This function does not select the specified audio output plugin. - * libvlc_audio_output_set() is used for that purpose. - *
- * The syntax for the device parameter depends on the audio output. - *
- * Some audio output modules require further parameters (e.g. a channels map - * in the case of ALSA). - * - * @param p_mi media player - * @param psz_audio_output if NULL, current audio output module; if non-NULL, name of audio output module (@see libvlc_audio_output_t) - * @param psz_device_id device identifier string - */ - public static native void libvlc_audio_output_device_set(libvlc_media_player_t p_mi, String psz_audio_output, String psz_device_id); - - /** - * Get the current audio output device identifier. - * - * This complements libvlc_audio_output_device_set(). - * - * The initial value for the current audio output device identifier - * may not be set or may be some unknown value. A LibVLC application should - * compare this value against the known device identifiers (e.g. those that - * were previously retrieved by a call to libvlc_audio_output_device_enum or - * libvlc_audio_output_device_list_get) to find the current audio output device. - * - * It is possible that the selected audio output device changes (an external - * change) without a call to libvlc_audio_output_device_set. That may make this - * method unsuitable to use if a LibVLC application is attempting to track - * dynamic audio device changes as they happen. - * - * @param mp media player - * @return the current audio output device identifier - * NULL if no device is selected or in case of error - * (the result must be released with free() or libvlc_free()). - * @since LibVLC 3.0.0 or later. - */ - public static native Pointer libvlc_audio_output_device_get(libvlc_media_player_t mp); - - /** - * Toggle mute status. - * - * @param p_mi media player - */ - public static native void libvlc_audio_toggle_mute(libvlc_media_player_t p_mi); - - /** - * Get current mute status. - * - * @param p_mi media player - * @return the mute status (boolean) - */ - public static native int libvlc_audio_get_mute(libvlc_media_player_t p_mi); - - /** - * Set mute status. - * - * @param p_mi media player - * @param status If status is true then mute, otherwise unmute - */ - public static native void libvlc_audio_set_mute(libvlc_media_player_t p_mi, int status); - - /** - * Get current software audio volume. - * - * @param p_mi media player - * @return the software volume in percents (0 = mute, 100 = nominal / 0dB) - */ - public static native int libvlc_audio_get_volume(libvlc_media_player_t p_mi); - - /** - * Set current software audio volume. - * - * @param p_mi media player - * @param i_volume the volume in percents (0 = mute, 100 = 0dB) - * @return 0 if the volume was set, -1 if it was out of range - */ - public static native int libvlc_audio_set_volume(libvlc_media_player_t p_mi, int i_volume); - - /** - * Get number of available audio tracks. - * - * @param p_mi media player - * @return the number of available audio tracks (int), or -1 if unavailable - */ - public static native int libvlc_audio_get_track_count(libvlc_media_player_t p_mi); - - /** - * Get the description of available audio tracks. - * - * @param p_mi media player - * @return list with description of available audio tracks, or NULL - */ - public static native libvlc_track_description_t libvlc_audio_get_track_description(libvlc_media_player_t p_mi); - - /** - * Get current audio track. - * - * @param p_mi media player - * @return the audio track ID or -1 if no active input. - */ - public static native int libvlc_audio_get_track(libvlc_media_player_t p_mi); - - /** - * Set current audio track. - * - * @param p_mi media player - * @param i_track the track ID (i_id field from track description) - * @return 0 on success, -1 on error - */ - public static native int libvlc_audio_set_track(libvlc_media_player_t p_mi, int i_track); - - /** - * Get current audio channel. - * - * @param p_mi media player - * @return the audio channel @see AudioChannel - */ - public static native int libvlc_audio_get_channel(libvlc_media_player_t p_mi); - - /** - * Set current audio channel. - * - * @param p_mi media player - * @param channel the audio channel, @see AudioChannel - * @return 0 on success, -1 on error - */ - public static native int libvlc_audio_set_channel(libvlc_media_player_t p_mi, int channel); - - /** - * Get current audio delay. - * - * @param p_mi media player - * @return amount audio is being delayed by, in microseconds - * @since LibVLC 1.1.1 - */ - public static native long libvlc_audio_get_delay(libvlc_media_player_t p_mi); - - /** - * Set current audio delay. The delay is only active for the current media item and will be - * reset to zero each time the media changes. - * - * @param p_mi media player - * @param i_delay amount to delay audio by, in microseconds - * @return 0 on success, -1 on error - * @since LibVLC 1.1.1 - */ - public static native int libvlc_audio_set_delay(libvlc_media_player_t p_mi, long i_delay); - - /** - * Get the number of equalizer presets. - * - * @return number of presets - * @since LibVLC 2.2.0 or later - */ - public static native int libvlc_audio_equalizer_get_preset_count(); - - /** - * Get the name of a particular equalizer preset. - *
- * This name can be used, for example, to prepare a preset label or menu in a user - * interface. - * - * @param u_index index of the preset, counting from zero - * @return preset name, or NULL if there is no such preset - * @since LibVLC 2.2.0 or later - */ - public static native String libvlc_audio_equalizer_get_preset_name(int u_index); - - /** - * Get the number of distinct frequency bands for an equalizer. - * - * @return number of frequency bands - * @since LibVLC 2.2.0 or later - */ - public static native int libvlc_audio_equalizer_get_band_count(); - - /** - * Get a particular equalizer band frequency. - *
- * This value can be used, for example, to create a label for an equalizer band control - * in a user interface. - * - * @param u_index index of the band, counting from zero - * @return equalizer band frequency (Hz), or -1 if there is no such band - * @since LibVLC 2.2.0 or later - */ - public static native float libvlc_audio_equalizer_get_band_frequency(int u_index); - - /** - * Create a new default equalizer, with all frequency values zeroed. - *
- * The new equalizer can subsequently be applied to a media player by invoking - * libvlc_media_player_set_equalizer(). - *
- * The returned handle should be freed via libvlc_audio_equalizer_release() when - * it is no longer needed. - * - * @return opaque equalizer handle, or NULL on error - * @since LibVLC 2.2.0 or later - */ - public static native libvlc_equalizer_t libvlc_audio_equalizer_new(); - - /** - * Create a new equalizer, with initial frequency values copied from an existing - * preset. - *
- * The new equalizer can subsequently be applied to a media player by invoking - * libvlc_media_player_set_equalizer(). - *
- * The returned handle should be freed via libvlc_audio_equalizer_release() when - * it is no longer needed. - * - * @param u_index index of the preset, counting from zero - * @return opaque equalizer handle, or NULL on error - * @since LibVLC 2.2.0 or later - */ - public static native libvlc_equalizer_t libvlc_audio_equalizer_new_from_preset(int u_index); - - /** - * Release a previously created equalizer instance. - *
- * The equalizer was previously created by using libvlc_audio_equalizer_new() or - * libvlc_audio_equalizer_new_from_preset(). - *
- * It is safe to invoke this method with a NULL p_equalizer parameter for no effect. - * - * @param p_equalizer opaque equalizer handle, or NULL - * @since LibVLC 2.2.0 or later - */ - public static native void libvlc_audio_equalizer_release(libvlc_equalizer_t p_equalizer); - - /** - * Set a new pre-amplification value for an equalizer. - *
- * The new equalizer settings are subsequently applied to a media player by invoking - * libvlc_media_player_set_equalizer(). - * - * @param p_equalizer valid equalizer handle, must not be NULL - * @param f_preamp preamp value (-20.0 to 20.0 Hz) - * @return zero on success, -1 on error - * @since LibVLC 2.2.0 or later - */ - public static native int libvlc_audio_equalizer_set_preamp(libvlc_equalizer_t p_equalizer, float f_preamp); - - /** - * Get the current pre-amplification value from an equalizer. - * - * @param p_equalizer valid equalizer handle, must not be NULL - * @return preamp value (Hz) - * @since LibVLC 2.2.0 or later - */ - public static native float libvlc_audio_equalizer_get_preamp(libvlc_equalizer_t p_equalizer); - - /** - * Set a new amplification value for a particular equalizer frequency band. - *
- * The new equalizer settings are subsequently applied to a media player by invoking - * libvlc_media_player_set_equalizer(). - * - * @param p_equalizer valid equalizer handle, must not be NULL - * @param f_amp amplification value (-20.0 to 20.0 Hz) - * @param u_band index, counting from zero, of the frequency band to set - * @return zero on success, -1 on error - * @since LibVLC 2.2.0 or later - */ - public static native int libvlc_audio_equalizer_set_amp_at_index( libvlc_equalizer_t p_equalizer, float f_amp, int u_band); - - /** - * Get the amplification value for a particular equalizer frequency band. - * - * @param p_equalizer valid equalizer handle, must not be NULL - * @param u_band index, counting from zero, of the frequency band to get - * @return amplification value (Hz); zero if there is no such frequency band - * @since LibVLC 2.2.0 or later - */ - public static native float libvlc_audio_equalizer_get_amp_at_index(libvlc_equalizer_t p_equalizer, int u_band); - - /** - * Apply new equalizer settings to a media player. - *
- * The equalizer is first created by invoking libvlc_audio_equalizer_new() or - * libvlc_audio_equalizer_new_from_preset(). - *
- * It is possible to apply new equalizer settings to a media player whether the media - * player is currently playing media or not. - *
- * Invoking this method will immediately apply the new equalizer settings to the audio - * output of the currently playing media if there is any. - *
- * If there is no currently playing media, the new equalizer settings will be applied - * later if and when new media is played. - *
- * Equalizer settings will automatically be applied to subsequently played media. - *
- * To disable the equalizer for a media player invoke this method passing NULL for the - * p_equalizer parameter. - *
- * The media player does not keep a reference to the supplied equalizer so it is safe - * for an application to release the equalizer reference any time after this method - * returns. - * - * @param p_mi opaque media player handle - * @param p_equalizer opaque equalizer handle, or NULL to disable the equalizer for this media player - * @return zero on success, -1 on error - * @since LibVLC 2.2.0 or later - */ - public static native int libvlc_media_player_set_equalizer(libvlc_media_player_t p_mi, libvlc_equalizer_t p_equalizer); - - /** - * Gets the media role. - * - * @param p_mi opaque media player handle - * @return the media player role (MediaPlayerRole) - * @since LibVLC 3.0.0 or later - */ - public static native int libvlc_media_player_get_role(libvlc_media_player_t p_mi); - - /** - * Sets the media role. - * - * @param p_mi opaque media player handle - * @param role the media player role (MediaPlayerRole) - * @return 0 on success, -1 on error - * @since LibVLC 3.0.0 or later - */ - public static native int libvlc_media_player_set_role(libvlc_media_player_t p_mi, int role); - - // === libvlc_media_player.h ================================================ - - // === libvlc_media_list.h ================================================== - - /** - * Create an empty media list. - * - * @param p_instance libvlc instance - * @return empty media list, or NULL on error - */ - public static native libvlc_media_list_t libvlc_media_list_new(libvlc_instance_t p_instance); - - /** - * Release media list created with libvlc_media_list_new(). - * - * @param p_ml a media list created with libvlc_media_list_new() - */ - public static native void libvlc_media_list_release(libvlc_media_list_t p_ml); - - /** - * Retain reference to a media list - * - * @param p_ml a media list created with libvlc_media_list_new() - */ - public static native void libvlc_media_list_retain(libvlc_media_list_t p_ml); - - /** - * Associate media instance with this media list instance. If another media instance was present - * it will be released. The libvlc_media_list_lock should NOT be held upon entering this - * function. - * - * @param p_ml a media list instance - * @param p_md media instance to add - */ - public static native void libvlc_media_list_set_media(libvlc_media_list_t p_ml, libvlc_media_t p_md); - - /** - * Get media instance from this media list instance. This action will increase the refcount on - * the media instance. The libvlc_media_list_lock should NOT be held upon entering this - * function. - * - * @param p_ml a media list instance - * @return media instance - */ - public static native libvlc_media_t libvlc_media_list_media(libvlc_media_list_t p_ml); - - /** - * Add media instance to media list The libvlc_media_list_lock should be held upon entering this - * function. - * - * @param p_ml a media list instance - * @param p_md a media instance - * @return 0 on success, -1 if the media list is read-only - */ - public static native int libvlc_media_list_add_media(libvlc_media_list_t p_ml, libvlc_media_t p_md); - - /** - * Insert media instance in media list on a position The libvlc_media_list_lock should be held - * upon entering this function. - * - * @param p_ml a media list instance - * @param p_md a media instance - * @param i_pos position in array where to insert - * @return 0 on success, -1 if the media list si read-only - */ - public static native int libvlc_media_list_insert_media(libvlc_media_list_t p_ml, libvlc_media_t p_md, int i_pos); - - /** - * Remove media instance from media list on a position The libvlc_media_list_lock should be held - * upon entering this function. - * - * @param p_ml a media list instance - * @param i_pos position in array where to insert - * @return 0 on success, -1 if the list is read-only or the item was not found - */ - public static native int libvlc_media_list_remove_index(libvlc_media_list_t p_ml, int i_pos); - - /** - * Get count on media list items The libvlc_media_list_lock should be held upon entering this - * function. - * - * @param p_ml a media list instance - * @return number of items in media list - */ - public static native int libvlc_media_list_count(libvlc_media_list_t p_ml); - - /** - * List media instance in media list at a position The libvlc_media_list_lock should be held - * upon entering this function. - * - * @param p_ml a media list instance - * @param i_pos position in array where to insert - * @return media instance at position i_pos, or NULL if not found. In case of success, - * libvlc_media_retain() is called to increase the refcount on the media. - */ - public static native libvlc_media_t libvlc_media_list_item_at_index(libvlc_media_list_t p_ml, int i_pos); - - /** - * Find index position of List media instance in media list. Warning: the function will return - * the first matched position. The libvlc_media_list_lock should be held upon entering this - * function. - * - * @param p_ml a media list instance - * @param p_md media list instance - * @return position of media instance - */ - public static native int libvlc_media_list_index_of_item(libvlc_media_list_t p_ml, libvlc_media_t p_md); - - /** - * This indicates if this media list is read-only from a user point of view - * - * @param p_ml media list instance - * @return 0 on readonly, 1 on readwrite - * - * FIXME I am pretty sure the documented return values are the wrong way around - */ - public static native int libvlc_media_list_is_readonly(libvlc_media_list_t p_ml); - - /** - * Get lock on media list items - * - * @param p_ml a media list instance - */ - public static native void libvlc_media_list_lock(libvlc_media_list_t p_ml); - - /** - * Release lock on media list items The libvlc_media_list_lock should be held upon entering this - * function. - * - * @param p_ml a media list instance - */ - public static native void libvlc_media_list_unlock(libvlc_media_list_t p_ml); - - /** - * Get libvlc_event_manager from this media list instance. The p_event_manager is immutable, so - * you don't have to hold the lock - * - * @param p_ml a media list instance - * @return libvlc_event_manager - */ - public static native libvlc_event_manager_t libvlc_media_list_event_manager(libvlc_media_list_t p_ml); - - // === libvlc_media_list.h ================================================== - - // === libvlc_media_list_player.h =========================================== - - /** - * Create new media_list_player. - * - * @param p_instance libvlc instance - * @return media list player instance or NULL on error - */ - public static native libvlc_media_list_player_t libvlc_media_list_player_new(libvlc_instance_t p_instance); - - /** - * Release a media_list_player after use. - * - * Decrement the reference count of a* media player object. If the reference count is 0, then - * libvlc_media_list_player_release() will release the media player object. If the media player - * object has been released, then it should not be used again. - * - * @param p_mlp media list player instance - */ - public static native void libvlc_media_list_player_release(libvlc_media_list_player_t p_mlp); - - /** - * Retain a reference to a media player list object. - * - * Use libvlc_media_list_player_release() to decrement reference count. - * - * @param p_mlp media player list object - */ - public static native void libvlc_media_list_player_retain(libvlc_media_list_player_t p_mlp); - - /** - * Return the event manager of this media_list_player. - * - * @param p_mlp media list player instance - * @return the event manager - */ - public static native libvlc_event_manager_t libvlc_media_list_player_event_manager(libvlc_media_list_player_t p_mlp); - - /** - * Replace media player in media_list_player with this instance. - * - * @param p_mlp media list player instance - * @param p_mi media player instance - */ - public static native void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t p_mlp, libvlc_media_player_t p_mi); - - /** - * Get media player of the media_list_player instance. - *
- * Note: the caller is responsible for releasing the returned instance. - * - * @param p_mlp media list player instance - * @return media player instance - * @since LibVLC 3.0.0 - */ - public static native libvlc_media_player_t libvlc_media_list_player_get_media_player(libvlc_media_list_player_t p_mlp); - - /** - * Set the media list associated with the player - * - * @param p_mlp media list player instance - * @param p_mlist list of media - */ - public static native void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t p_mlp, libvlc_media_list_t p_mlist); - - /** - * Play media list - * - * @param p_mlp media list player instance - */ - public static native void libvlc_media_list_player_play(libvlc_media_list_player_t p_mlp); - - /** - * Pause media list - * - * @param p_mlp media list player instance - */ - public static native void libvlc_media_list_player_pause(libvlc_media_list_player_t p_mlp); - - /** - * Pause or resume media list - * - * @param p_mlp media list player instance - * @param do_pause play/resume if zero, pause if non-zero - * @since LibVLC 3.0.0 or later - */ - public static native void libvlc_media_list_player_set_pause(libvlc_media_list_player_t p_mlp, int do_pause); - - /** - * Is media list playing? - * - * @param p_mlp media list player instance - * @return true for playing and false for not playing - */ - public static native int libvlc_media_list_player_is_playing(libvlc_media_list_player_t p_mlp); - - /** - * Get current libvlc_state of media list player - * - * @param p_mlp media list player instance - * @return State for media list player - */ - public static native int libvlc_media_list_player_get_state(libvlc_media_list_player_t p_mlp); - - /** - * Play media list item at position index - * - * @param p_mlp media list player instance - * @param i_index index in media list to play - * @return 0 upon success -1 if the item wasn't found - */ - public static native int libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t p_mlp, int i_index); - - /** - * Play the given media item - * - * @param p_mlp media list player instance - * @param p_md the media instance - * @return 0 upon success, -1 if the media is not part of the media list - */ - public static native int libvlc_media_list_player_play_item(libvlc_media_list_player_t p_mlp, libvlc_media_t p_md); - - /** - * Stop playing media list - * - * @param p_mlp media list player instance - */ - public static native void libvlc_media_list_player_stop(libvlc_media_list_player_t p_mlp); - - /** - * Play next item from media list - * - * @param p_mlp media list player instance - * @return 0 upon success -1 if there is no next item - */ - public static native int libvlc_media_list_player_next(libvlc_media_list_player_t p_mlp); - - /** - * Play previous item from media list - * - * @param p_mlp media list player instance - * @return 0 upon success -1 if there is no previous item - */ - public static native int libvlc_media_list_player_previous(libvlc_media_list_player_t p_mlp); - - /** - * Sets the playback mode for the playlist - * - * @param p_mlp media list player instance - * @param e_mode playback mode specification - */ - public static native void libvlc_media_list_player_set_playback_mode(libvlc_media_list_player_t p_mlp, int e_mode); - - // === libvlc_media_list_player.h =========================================== - - // === libvlc_dialog.h ====================================================== - - /** - * Register callbacks in order to handle VLC dialogs. - * - * @since LibVLC 3.0.0 and later. - * - * @param p_instance the instance - * @param p_cbs a pointer to callbacks, or NULL to unregister callbacks. - * @param p_data opaque pointer for the callback - */ - public static native void libvlc_dialog_set_callbacks(libvlc_instance_t p_instance, libvlc_dialog_cbs p_cbs, Pointer p_data); - - /** - * Associate an opaque pointer with the dialog id. - * - * @since LibVLC 3.0.0 and later. - * - * @param p_id id of the dialog - * @param p_context opaque pointer associated with the dialog id - */ - public static native void libvlc_dialog_set_context(libvlc_dialog_id p_id, Pointer p_context); - - /** - * Return the opaque pointer associated with the dialog id. - * - * @since LibVLC 3.0.0 and later. - * - * @param p_id id of the dialog - * @return opaque pointer associated with the dialog id - */ - public static native Pointer libvlc_dialog_get_context(libvlc_dialog_id p_id); - - /** - * Post a login answer. - *
- * After this call, p_id won't be valid anymore - * - * @see libvlc_dialog_cbs#pf_display_login - * - * @since LibVLC 3.0.0 and later. - * - * @param p_id id of the dialog - * @param psz_username valid and non empty string - * @param psz_password valid string (can be empty) - * @param b_store if true, store the credentials - * @return 0 on success, or -1 on error - */ - public static native int libvlc_dialog_post_login(libvlc_dialog_id p_id, String psz_username, String psz_password, int b_store); - - /** - * Post a question answer. - *
- * After this call, p_id won't be valid anymore - * - * @see libvlc_dialog_cbs#pf_display_question - * - * @since LibVLC 3.0.0 and later. - * - * @param p_id id of the dialog - * @param i_action 1 for action1, 2 for action2 - * @return 0 on success, or -1 on error - */ - public static native int libvlc_dialog_post_action(libvlc_dialog_id p_id, int i_action); - - /** - * Dismiss a dialog. - *
- * After this call, p_id won't be valid anymore
- *
- * @see libvlc_dialog_cbs#pf_cancel
- *
- * @since LibVLC 3.0.0 and later.
- *
- * @param p_id id of the dialog
- * @return 0 on success, or -1 on error
- */
- public static native int libvlc_dialog_dismiss(libvlc_dialog_id p_id);
-
- // === libvlc_dialog.h ======================================================
-
- // === libvlc_media_discoverer.h ============================================
-
- /**
- * Create a media discoverer object by name.
- *
- * After this object is created, you should attach to events in order to be
- * notified of the discoverer state.
- *
- * You should also attach to media_list events in order to be notified of new
- * items discovered.
- *
- * You need to call {@link #libvlc_media_discoverer_start(libvlc_media_discoverer_t)}
- * in order to start the discovery.
- *
- * @see #libvlc_media_discoverer_media_list(libvlc_media_discoverer_t)
- * @see #libvlc_media_discoverer_start(libvlc_media_discoverer_t)
- *
- * @param p_inst libvlc instance
- * @param psz_name service name
- * @return media discover object or NULL in case of error
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native libvlc_media_discoverer_t libvlc_media_discoverer_new(libvlc_instance_t p_inst, String psz_name);
-
- /**
- * Start media discovery.
- *
- * To stop it, call libvlc_media_discoverer_stop() or
- * libvlc_media_discoverer_release() directly.
- *
- * @see #libvlc_media_discoverer_stop(libvlc_media_discoverer_t)
- *
- * @param p_mdis media discover object
- * @return -1 in case of error, 0 otherwise
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native int libvlc_media_discoverer_start(libvlc_media_discoverer_t p_mdis);
-
- /**
- * Stop media discovery.
- *
- * @see #libvlc_media_discoverer_start(libvlc_media_discoverer_t)
- *
- * @param p_mdis media discover object
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native void libvlc_media_discoverer_stop(libvlc_media_discoverer_t p_mdis);
-
- /**
- * Release media discover object. If the reference count reaches 0, then the object will be
- * released.
- *
- * @param p_mdis media service discover object
- */
- public static native void libvlc_media_discoverer_release(libvlc_media_discoverer_t p_mdis);
-
- /**
- * Get media service discover media list.
- *
- * @param p_mdis media service discover object
- * @return list of media items
- */
- public static native libvlc_media_list_t libvlc_media_discoverer_media_list(libvlc_media_discoverer_t p_mdis);
-
- /**
- * Query if media service discover object is running.
- *
- * @param p_mdis media service discover object
- * @return true if running, false if not
- */
- public static native int libvlc_media_discoverer_is_running(libvlc_media_discoverer_t p_mdis);
-
- /**
- * Get media discoverer services by category
- *
- * @param p_inst libvlc instance
- * @param i_cat category of services to fetch
- * @param ppp_services address to store an allocated array of media discoverer services (must be freed with libvlc_media_discoverer_list_release() by the caller) [OUT]
- * @return the number of media discoverer services (0 on error)
- *
- * @since LibVLC 3.0.0 and later.
- */
- public static native size_t libvlc_media_discoverer_list_get(libvlc_instance_t p_inst, int i_cat, PointerByReference ppp_services);
-
- /**
- * Release an array of media discoverer services
- *
- * @see #libvlc_media_discoverer_list_get(libvlc_instance_t, int, PointerByReference)
- *
- * @param pp_services array to release
- * @param i_count number of elements in the array
- *
- * @since LibVLC 3.0.0 and later.
- */
- public static native void libvlc_media_discoverer_list_release(Pointer pp_services, size_t i_count);
-
- // === libvlc_media_discoverer.h ============================================
-
- // === libvlc_renderer_discoverer.h =========================================
-
- /**
- * Hold a renderer item, i.e. creates a new reference
- *
- * This functions need to called from the libvlc_RendererDiscovererItemAdded
- * callback if the libvlc user wants to use this item after. (for display or
- * for passing it to the mediaplayer for example).
- *
- * @return the current item
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native libvlc_renderer_item_t libvlc_renderer_item_hold(libvlc_renderer_item_t p_item);
-
- /**
- * Releases a renderer item, i.e. decrements its reference counter
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native void libvlc_renderer_item_release(libvlc_renderer_item_t p_item);
-
- /**
- * Get the human readable name of a renderer item
- *
- * @return the name of the item (can't be NULL, must *not* be freed)
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native String libvlc_renderer_item_name(libvlc_renderer_item_t p_item);
-
- /**
- * Get the type (not translated) of a renderer item. For now, the type can only
- * be "chromecast" ("upnp", "airplay" may come later).
- *
- * @return the type of the item (can't be NULL, must *not* be freed)
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native String libvlc_renderer_item_type(libvlc_renderer_item_t p_item);
-
- /**
- * Get the icon uri of a renderer item
- *
- * @return the uri of the item's icon (can be NULL, must *not* be freed)
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native String libvlc_renderer_item_icon_uri(libvlc_renderer_item_t p_item);
-
- /**
- * Get the flags of a renderer item
- *
- * @return bitwise flag: capabilities of the renderer, see
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native int libvlc_renderer_item_flags(libvlc_renderer_item_t p_item);
-
- /**
- * Create a renderer discoverer object by name
- *
- * After this object is created, you should attach to events in order to be
- * notified of the discoverer events.
- *
- * You need to call libvlc_renderer_discoverer_start() in order to start the
- * discovery.
- *
- * @see #libvlc_renderer_discoverer_event_manager(libvlc_renderer_discoverer_t)
- * @see #libvlc_renderer_discoverer_start(libvlc_renderer_discoverer_t)
- *
- * @param p_inst libvlc instance
- * @param psz_name service name; use libvlc_renderer_discoverer_list_get() to
- * get a list of the discoverer names available in this libVLC instance
- * @return media discover object or NULL in case of error
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native libvlc_renderer_discoverer_t libvlc_renderer_discoverer_new(libvlc_instance_t p_inst, String psz_name);
-
- /**
- * Release a renderer discoverer object
- *
- * @param p_rd renderer discoverer object
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native void libvlc_renderer_discoverer_release(libvlc_renderer_discoverer_t p_rd);
-
- /**
- * Start renderer discovery
- *
- * To stop it, call libvlc_renderer_discoverer_stop() or
- * libvlc_renderer_discoverer_release() directly.
- *
- * @see #libvlc_renderer_discoverer_stop(libvlc_renderer_discoverer_t)
- *
- * @param p_rd renderer discoverer object
- * @return -1 in case of error, 0 otherwise
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native int libvlc_renderer_discoverer_start(libvlc_renderer_discoverer_t p_rd);
-
- /**
- * Stop renderer discovery.
- *
- * @see #libvlc_renderer_discoverer_start(libvlc_renderer_discoverer_t)
- *
- * @param p_rd renderer discoverer object
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native void libvlc_renderer_discoverer_stop(libvlc_renderer_discoverer_t p_rd);
-
- /**
- * Get the event manager of the renderer discoverer
- *
- * The possible events to attach are @ref libvlc_RendererDiscovererItemAdded
- * and @ref libvlc_RendererDiscovererItemDeleted.
- *
- * The @ref libvlc_renderer_item_t struct passed to event callbacks is owned by
- * VLC, users should take care of holding/releasing this struct for their
- * internal usage.
- *
- * @see libvlc_event_u#renderer_discoverer_item_added
- * @see libvlc_event_u#renderer_discoverer_item_deleted
- *
- * @return a valid event manager (can't fail)
- *
- * @since LibVLC 3.0.0 or later
- */
- public static native libvlc_event_manager_t libvlc_renderer_discoverer_event_manager(libvlc_renderer_discoverer_t p_rd);
-
- /**
- * Get media discoverer services
- *
- * @see #libvlc_renderer_discoverer_list_release(Pointer, size_t)
- *
- * @param p_inst libvlc instance
- * @param ppp_services address to store an allocated array of renderer
- * discoverer services (must be freed with libvlc_renderer_list_release() by
- * the caller) [OUT]
- *
- * @return the number of media discoverer services (0 on error)
- *
- * @since LibVLC 3.0.0 and later
- */
- public static native size_t libvlc_renderer_discoverer_list_get(libvlc_instance_t p_inst, PointerByReference ppp_services);
-
- /**
- * Release an array of media discoverer services
- *
- * @see #libvlc_renderer_discoverer_list_get(libvlc_instance_t, PointerByReference)
- *
- * @param pp_services array to release
- * @param i_count number of elements in the array
- *
- * @since LibVLC 3.0.0 and later
- */
- public static native void libvlc_renderer_discoverer_list_release(Pointer pp_services, size_t i_count);
-
- // === libvlc_renderer_discoverer.h =========================================
-
- // === libvlc_picture.h =====================================================
-
- /**
- * Increment the reference count of this picture.
- *
- * @see #libvlc_picture_release(libvlc_picture_t)
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ void libvlc_picture_retain(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Decrement the reference count of this picture.
- * When the reference count reaches 0, the picture will be released.
- * The picture must not be accessed after calling this function.
- *
- * @see #libvlc_picture_retain(libvlc_picture_t)
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ void libvlc_picture_release(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Saves this picture to a file. The image format is the same as the one
- * returned by \link libvlc_picture_type \endlink
- *
- * @param pic A picture object
- * @param path The path to the generated file
- * @return 0 in case of success, -1 otherwise
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ int libvlc_picture_save(libvlc_picture_t pic, String path) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the image internal buffer, including potential padding.
- * The libvlc_picture_t owns the returned buffer, which must not be modified nor
- * freed.
- *
- * @param pic A picture object
- * @param size A pointer to a size_t that will hold the size of the buffer [required]
- * @return A pointer to the internal buffer.
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ Pointer libvlc_picture_get_buffer(libvlc_picture_t pic, size_tByReference size) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the picture type
- *
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ int libvlc_picture_type(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the image stride, ie. the number of bytes per line.
- * This can only be called on images of type libvlc_picture_Argb
- *
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ int libvlc_picture_get_stride(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the width of the image in pixels
- *
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ int libvlc_picture_get_width(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the height of the image in pixels
- *
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ int libvlc_picture_get_height(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Returns the time at which this picture was generated, in milliseconds
- * @param pic A picture object
- *
- * @since libvlc 4.0 or later
- */
- public static /*native*/ long libvlc_picture_get_time(libvlc_picture_t pic) {
- throw new UnsupportedOperationException();
- }
-
- // === libvlc_picture.h =====================================================
-
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibX11.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibX11.java
deleted file mode 100644
index 1af636f8..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LibX11.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * The only exposed API is that used to initialise XLib for multi-threaded access. - *
- * Usage is simple, at the start of an application: - * - *
- * int result = LibX11.INSTANCE.XInitThreads(); - * // "result" will be non-zero if the native library call succeeded - *- */ -public interface LibX11 extends Library { - - /** - * Native library instance. - *
- * Conceivably Xlib could be present on Windows. - */ - // LibX11 INSTANCE = Native.load("X11", LibX11.class); - LibX11 INSTANCE = Native.loadLibrary("X11", LibX11.class); -// LibX11 INSTANCE = ReflectTool.findAndInvokeWithReturn(new String[]{"load", "loadLibrary"}, Native.class, null, "X11", LibX11.class); - - /** - * Initialise Xlib support for concurrent threads. - *
- * Invoking this at the start of an application can reduce the chance of a fatal JVM crash when
- * using multiple media players.
- *
- * @return non-zero on success, zero on failure (or if threading is not supported)
- */
- int XInitThreads();
-
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LinuxNativeInit.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LinuxNativeInit.java
deleted file mode 100644
index 8ddcf747..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/LinuxNativeInit.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * If there are any errors when executing this initialization code, there is little point in even reporting them as - * nothing else can be done. The approach therefore is doing a best-effort at running this initialization and robustly - * ignore errors. - *
- * The reality is that the nature of the initialization code means errors simply should not occur.
- */
-public final class LinuxNativeInit {
-
- public static void init() {
- initAWT();
- initX();
- }
-
- private static void initAWT() {
- if (!GraphicsEnvironment.isHeadless()) {
- try {
- // To prevent crashes in some applications, we must seemingly make sure that Swing is initialised before
- // force-loading libjawt - empirically both of these things are required
- new JPanel();
- System.loadLibrary("jawt");
- }
- catch (UnsatisfiedLinkError e) {
- }
- }
- }
-
- /**
- * With recent VLC/JDK it seems necessary to do this - it can however cause problems if using the JVM splash-screen
- * options. Without this, VLC may complain to the console output and it is also possible that opening a JavaFX
- * FileChooser will cause a fatal JVM crash.
- */
- private static void initX() {
- String initX = System.getProperty("VLCJ_INITX");
- if (!"no".equalsIgnoreCase(initX)) {
- try {
- LibX11.INSTANCE.XInitThreads();
- }
- catch (Exception e) {
- }
- }
- }
-
- private LinuxNativeInit() {
- }
-
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeString.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeString.java
deleted file mode 100644
index 260a61dc..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeString.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This class takes care of freeing the memory that was natively allocated for the string, if needed. - *
- * Generally, any native API that returns "const char*" must not be freed, so in such cases the native return - * type mapping can actually be String rather than {@link Pointer}. Alternatively, {@link #copyNativeString(Pointer)} - * can be used. - *
- * Generally, Any native API that returns "char*" must be freed, so in such cases the native return type - * mapping must be {@link Pointer} and {@link #copyAndFreeNativeString(Pointer)} must be used. - *
- * Where a native string is contained in a {@link com.sun.jna.Structure} those strings should not be freed if - * the structure itself is subsequently freed (usually by a companion release native method), so in these cases - * {@link #copyNativeString(Pointer)} must be used. - */ -public final class NativeString { - - /** - * Prevent direct instantiation by others. - */ - private NativeString() { - } - - /** - * Get a String from a native string pointer, freeing the native string pointer when done. - *
- * If the native string pointer is not freed then a native memory leak will occur. - *
- * Use this method if the native string type is "char*", i.e. lacking the "const" modifier.
- *
- * @param pointer pointer to native string, may be null
- * @return string, or null if the pointer was null
- */
- public static String copyAndFreeNativeString(Pointer pointer) {
- if(pointer != null) {
- // Pointer.getString copies native memory to a Java String
- String result = pointer.getString(0);
- libvlc_free(pointer);
- return result;
- }
- else {
- return null;
- }
- }
-
- /**
- * Copy a String from a native string pointer, without freeing the native pointer.
- *
- * Use this method if the native string type is "const char*".
- *
- * @param pointer pointer to native string, may be null
- * @return string, or null if the pointer was null
- */
- public static String copyNativeString(Pointer pointer) {
- if(pointer != null) {
- // Pointer.getString copies native memory to a Java String
- return pointer.getString(0);
- }
- else {
- return null;
- }
- }
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeUri.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeUri.java
deleted file mode 100644
index 487c712f..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/NativeUri.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This method deals with the special case of an MRL for a local file name containing Unicode characters. Such MRLs - * must be encoded as file URLs, by adding a "file://" prefix before percent-encoding the filename. - *
- * Without this, vlc will not be able to play the file since it is using native API that can not handle unencoded - * Unicode characters. - *
- * This method does not deal with any MRLs that are URLs since Unicode characters are forbidden by specification for - * any URL. - *
- * What this means in practical terms is that if an MRL is specified that contains a "scheme" like "http", or "file"
- * then that MRL will not be encoded by this method, even if it contains Unicode characters. This situation
- * if it arises, is considered a client application validation failure.
- *
- * @param uri URI
- * @return the original URI if no encoding is required, or a percent-encoded ASCII file URI
- */
- public static String encodeUri(URL uri) {
- String result = uri.toString();
- if (result.startsWith("file:/")) result = result.replaceFirst("file:/", "file:///");
- return result;
- }
-
- /**
- * Encode a local file path to a valid URI, properly escaping any Unicode characters wit "percent" encoding.
- *
- * @param filename filename to encode as a URI
- * @return URI
- */
- public static String encodeFileUri(String filename) {
- return toLocalFileUri(filename);
- }
-
- /**
- * Does a String contain any Unicode characters?
- *
- * @param value string to test
- * @deprecated See #1142
- * @return true if the supplied String contains any Unicode characters; false if it does not
- */
- private static boolean containsUnicode(String value) {
- boolean result = false;
- for (int i = 0; i < value.length(); i++) {
- if (value.charAt(i) >= '\u0080') {
- result = true;
- break;
- }
- }
- return result;
- }
-
- /**
- * Encode a string using ASCII escape sequences as necessary.
- *
- * According to {@link File#toURI()} Javadoc, the format of the URI is system-dependent - this means that we can not - * rely on the file URI starting "file:/" (bad) or "file://" good, so we must account for either case. - *
- * With JDK 1.7+ we could have used the Path class to get a URI in the proper format. - *
- * Implementation notes: - *
- * The main concern is to check if the URI starts "file:/", or "file://", clearly care must be taken with this test, - * since the leading characters match, so we must base our condition on the longer string. - *
- * If the URI starts with "file://", we are done at this point and return. - *
- * If the URI starts with "file:/", as is almost certainly the case when using {@link File#toURI()}, then we apply a
- * replacement by dropping "file:/" and adding "file:///" in its place. When replacing in this manner, a third slash
- * is added to separate the unused "authority" part of the URI (this could in theory have been something like
- * "file://localhost/path/file.ext", so we return it as "file:///path/file.ext" instead).
- *
- * @param value value to encode
- * @deprecated See #1142
- * @return encoded value
- */
- private static String toLocalFileUri(String value) {
- value = value.replaceFirst("file:(/{1,3})", "");
- String asciiString = new File(value).toURI().toASCIIString();
- if (asciiString.startsWith("file://")) {
- // URI already starts with "file://", so simply return the ASCII string
- return asciiString;
- } else {
- // URI therefore starts by so replace the bad prefix with a proper one
- String url = asciiString.replaceFirst("file:/", "file:///");
- if (!url.startsWith("file:///")) url = "file:///" + url;
- return url;
- }
- }
-
- private NativeUri() {
- }
-
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/OsxComponentId.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/OsxComponentId.java
deleted file mode 100644
index 326c18b1..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/OsxComponentId.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This implementation uses reflection to drill-down and find the native component id.
- *
- * @param component component
- * @return component id
- */
- public static long getOsxComponentId(Component component) {
- // Try the usual method first, this should still work on JDK 1.6
- try {
- long componentId = Native.getComponentID(component);
- if (componentId != 0) {
- return componentId;
- }
- }
- catch (Exception e) {
- }
-
- // Try for Apple's JDK 1.6
- try {
- Method getPeer = Component.class.getMethod("getPeer");
- Object peer = getPeer.invoke(component);
- Method getViewPtr = peer.getClass().getMethod("getViewPtr");
- return (Long) getViewPtr.invoke(peer);
- }
- catch (Exception e) {
- }
-
- // Window at least is heavyweight so this might work
- if (component instanceof Window) {
- Window window = (Window) component;
- try {
- Method getPeer = Window.class.getMethod("getPeer");
- Object peer = getPeer.invoke(window);
- Method getPlatformWindow = peer.getClass().getMethod("getPlatformWindow");
- Object platformWindow = getPlatformWindow.invoke(peer);
- Method getContentView = platformWindow.getClass().getMethod("getContentView");
- Object contentView = getContentView.invoke(platformWindow);
- Method getAwtView = contentView.getClass().getMethod("getAWTView");
- return (Long) getAwtView.invoke(contentView);
- }
- catch (Exception e) {
- }
- }
-
- return 0L;
- }
-
- private OsxComponentId() {
- }
-
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/RuntimeUtil.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/RuntimeUtil.java
deleted file mode 100644
index 15882e0b..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/RuntimeUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * The com.sun.jna.Platform class provides similar functionality.
- */
-public final class RuntimeUtil {
-
- /**
- * Operating System Name system property.
- */
- private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
-
- /**
- * Prevent direct instantiation by others.
- */
- private RuntimeUtil() {
- }
-
- /**
- * Test whether the runtime operating system is "unix-like".
- *
- * @return true if the runtime OS is unix-like, Linux, Unix, FreeBSD etc
- */
- public static boolean isNix() {
- return OS_NAME.contains("nux") || OS_NAME.contains("nix") || OS_NAME.contains("freebsd"); // WATERMeDIA PATCH
- }
-
- /**
- * Test whether the runtime operating system is a Windows variant.
- *
- * @return true if the runtime OS is Windows
- */
- public static boolean isWindows() {
- return OS_NAME.contains("win"); // WATERMeDIA PATCH
- }
-
- /**
- * Test whether the runtime operating system is a Mac variant.
- *
- * @return true if the runtime OS is Mac
- */
- public static boolean isMac() {
- return OS_NAME.contains("mac"); // WATERMeDIA PATCH
- }
-
- /**
- * Get the native library name.
- *
- * @return library name
- */
- public static String getLibVlcLibraryName() {
- return isWindows() ? "libvlc" : "vlc";
- }
-
- /**
- *
- *
- * @return
- */
- public static String getLibVlcCoreLibraryName() {
- return isWindows() ? "libvlccore" : "vlccore";
- }
-
-}
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_cleanup_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_cleanup_cb.java
deleted file mode 100644
index 15b8f492..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_cleanup_cb.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * (i.e. wait for pending buffers to be played).
- *
- * @param data data pointer as passed to libvlc_audio_set_callbacks()
- */
- void drain(Pointer data);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_flush_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_flush_cb.java
deleted file mode 100644
index 9041b681..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_flush_cb.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * (i.e. discard all pending buffers and stop playback as soon as possible).
- *
- * @param data data pointer as passed to libvlc_audio_set_callbacks()
- * @param pts presentation time stamp
- */
- void flush(Pointer data, long pts);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_output_device_t.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_output_device_t.java
deleted file mode 100644
index e5c77bc9..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_output_device_t.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * Note: The pause callback is never called if the audio is already paused.
- *
- * @param data data pointer as passed to libvlc_audio_set_callbacks()
- * @param pts time stamp of the pause request (should be elapsed already)
- */
- void pause(Pointer data, long pts);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_play_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_play_cb.java
deleted file mode 100644
index 650ad8b2..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_play_cb.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * Note: The resume callback is never called if the audio is not paused.
- *
- * @param data data pointer as passed to libvlc_audio_set_callbacks()
- * @param pts time stamp of the resumption request (should be elapsed already)
- */
- void resume(Pointer data, long pts);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_set_volume_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_set_volume_cb.java
deleted file mode 100644
index 2f73377e..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_set_volume_cb.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This is called when the media player needs to create a new audio output.
- *
- * @param data pointer to the data pointer passed to libvlc_audio_set_callbacks()
- * @param format 4 bytes sample format
- * @param rate sample rate
- * @param channels channels count
- * @return 0 on success, anything else to skip audio playback
- */
- int setup(PointerByReference data, String format, IntByReference rate, IntByReference channels);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_track_t.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_track_t.java
deleted file mode 100644
index d6b6e84e..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_audio_track_t.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * You can interact with this dialog by calling libvlc_dialog_post_login()
- * to post an answer or libvlc_dialog_dismiss() to cancel this dialog.
- *
- * to receive this callack, libvlc_dialog_cbs.pf_cancel should not be NULL.
- *
- * @param p_data opaque pointer for the callback
- * @param p_id id used to interact with the dialog
- * @param psz_title title of the diaog
- * @param psz_text text of the dialog
- * @param psz_default_username user name that should be set on the user form
- * @param b_ask_store if true, ask the user if he wants to save the credentials
- */
- void callback(Pointer p_data, libvlc_dialog_id p_id, String psz_title, String psz_text, String psz_default_username, int b_ask_store);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_progress_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_progress_cb.java
deleted file mode 100644
index 7e442b6d..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_progress_cb.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * If cancellable (psz_cancel != NULL), you can cancel this dialog by
- * calling libvlc_dialog_dismiss()
- *
- * to receive this callack, libvlc_dialog_cbs.pf_cancel and
- * libvlc_dialog_cbs.pf_update_progress should not be NULL.
- *
- * @param p_data opaque pointer for the callback
- * @param p_id id used to interact with the dialog
- * @param psz_title title of the diaog
- * @param psz_text text of the dialog
- * @param b_indeterminate true if the progress dialog is indeterminate
- * @param f_position initial position of the progress bar (between 0.0 and 1.0)
- * @param psz_cancel text of the cancel button, if NULL the dialog is not cancellable
- */
- void callback(Pointer p_data, libvlc_dialog_id p_id, String psz_title, String psz_text, int b_indeterminate, float f_position, String psz_cancel);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_question_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_question_cb.java
deleted file mode 100644
index 88b9886b..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_display_question_cb.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * You can interact with this dialog by calling libvlc_dialog_post_action()
- * to post an answer or libvlc_dialog_dismiss() to cancel this dialog.
- *
- * to receive this callack, libvlc_dialog_cbs.pf_cancel should not be
- * NULL.
- *
- * @param p_data opaque pointer for the callback
- * @param p_id id used to interact with the dialog
- * @param psz_title title of the dialog
- * @param psz_text text of the dialog
- * @param i_type question type (or severity) of the dialog
- * @param psz_cancel text of the cancel button
- * @param psz_action1 text of the first button, if NULL, don't display this button
- * @param psz_action2 text of the second button, if NULL, don't display this button
- */
- void callback(Pointer p_data, libvlc_dialog_id p_id, String psz_title, String psz_text, int i_type, String psz_cancel, String psz_action1, String psz_action2);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_id.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_id.java
deleted file mode 100644
index 9dfae2db..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_dialog_id.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * Whenever a new video frame needs to be decoded, the lock callback is invoked. Depending on
- * the video chroma, one or three pixel planes of adequate dimensions must be returned via the
- * second parameter. Those planes must be aligned on 32-bytes boundaries.
- *
- * @param opaque private pointer as passed to libvlc_video_set_callbacks() [IN]
- * @param planes start address of the pixel planes (LibVLC allocates the array of void pointers, this callback must initialize the array) [OUT]
- * @return a private pointer for the display and unlock callbacks to identify the picture buffers
- */
- Pointer lock(Pointer opaque, PointerByReference planes);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_cb.java
deleted file mode 100644
index 6563681e..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_cb.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * Log message handlers must be thread-safe.
- *
- * @param data data pointer as given to libvlc_log_set()
- * @param level message level
- * @param ctx message context (meta-informations about the message)
- * @param format printf() format string (as defined by ISO C11)
- * @param args variable argument list for the format
- */
- void log(Pointer data, int level, libvlc_log_t ctx, String format, Pointer args);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_t.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_t.java
deleted file mode 100644
index 9d7cae17..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_log_t.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * The same media item can be opened multiple times. Each time, this callback
- * is invoked. It should allocate and initialize any instance-specific
- * resources, then store them in *datap. The instance resources can be freed
- * in the @ref libvlc_close_cb callback.
- *
- * For convenience, datap is initially NULL and sizep is initially 0.
- *
- * @param opaque private pointer as passed to libvlc_media_new_callbacks()
- * @param datap storage space for a private data pointer [OUT]
- * @param sizep byte length of the bitstream or 0 if unknown [OUT]
- * @return 0 on success, non-zero on error. In case of failure, the other
- * callbacks will not be invoked and any value stored in datap and sizep is
- * discarded.
- */
- int open(Pointer opaque, PointerByReference datap, LongByReference sizep);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_player_t.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_player_t.java
deleted file mode 100644
index 70b234c1..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_player_t.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * If no data is immediately available, then the callback should sleep.
- *
- * The application is responsible for avoiding deadlock situations.
- * In particular, the callback should return an error if playback is stopped;
- * if it does not return, then libvlc_media_player_stop() will never return.
- *
- * @param opaque private pointer as set by the @ref libvlc_media_open_cb callback
- * @param buf start address of the buffer to read data into
- * @param len bytes length of the buffer
- *
- * @return strictly positive number of bytes read, 0 on end-of-stream, or -1 on non-recoverable error
- */
- size_t read(Pointer opaque, Pointer buf, size_t len);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_seek_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_seek_cb.java
deleted file mode 100644
index 7a24c334..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_media_seek_cb.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This callback gets the format of the video as output by the video decoder and the chain of
- * video filters (if any). It can opt to change any parameter as it needs. In that case, LibVLC
- * will attempt to convert the video format (rescaling and chroma conversion) but these
- * operations can be CPU intensive.
- *
- * @param opaque pointer to the private pointer passed to libvlc_video_set_callbacks() [IN/OUT]
- * @param chroma pointer to the 4 bytes video format identifier [IN/OUT]
- * @param width pointer to the pixel width [IN/OUT]
- * @param height pointer to the pixel height [IN/OUT]
- * @param pitches table of scanline pitches in bytes for each pixel plane (the table is
- * allocated by LibVLC) [OUT]
- * @param lines table of scanlines count for each plane [OUT]
- * @return the number of picture buffers allocated, 0 indicates failure
- *
- * Note: For each pixels plane, the scanline pitch must be bigger than or equal to the
- * number of bytes per pixel multiplied by the pixel width. Similarly, the number of
- * scanlines must be bigger than of equal to the pixel height. Furthermore, we recommend
- * that pitches and lines be multiple of 32 to not break assumption that might be made
- * by various optimizations in the video decoders, video filters and/or video
- * converters.
- */
- int format(PointerByReference opaque, PointerByReference chroma, IntByReference width, IntByReference height, PointerByReference pitches, PointerByReference lines);
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_video_getProcAddress_cb.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_video_getProcAddress_cb.java
deleted file mode 100644
index 64aa11c1..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/binding/internal/libvlc_video_getProcAddress_cb.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of VLCJ.
- *
- * VLCJ is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VLCJ is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VLCJ. If not, see
- * This value may be unreliable, for example when parsing media some types are reported
- * multiple times and some types are not reported at all.
- */
- public int meta_type;
-
- @Override
- protected List
- * This is needed since local files must be played differently to non-local MRLs
- * like streaming URLs or "screen://".
- *
- * This is essentially an internal class.
- */
-final class MediaResourceLocator {
-
- /**
- * Simple pattern to detect locations.
- */
- private static final Pattern MRL_LOCATION_PATTERN = Pattern.compile(".+://.*");
-
- private MediaResourceLocator() {
- }
-
- /**
- * Does the MRL represent a "location"?
- *
- * @param mrl media resource locator
- * @return
- * @see NativeUri#encodeUri(URL)
- *
- * @param mrl MRL
- * @return the original MRL if no encoding is required, or a percent-encoded file URL
- */
- static String encodeMrl(URL mrl) {
- String url = NativeUri.encodeUri(mrl);
- VideoLan4J.LOGGER.debug("Encoded URL: {}", url);
- return url;
- }
-
-}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/events/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/events/package-info.java
deleted file mode 100644
index 10645964..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/events/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Events relating to media.
- */
-package me.lib720.caprica.vlcj.media.events;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/medialist/events/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/medialist/events/package-info.java
deleted file mode 100644
index c9b59991..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/medialist/events/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Media list events.
- */
-package me.lib720.caprica.vlcj.medialist.events;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/package-info.java
deleted file mode 100644
index 6a1c69ac..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Java framework for the VLC media player.
- *
- * Most applications should start with the {@link me.lib720.caprica.vlcj.factory.MediaPlayerFactory}.
- */
-package me.lib720.caprica.vlcj;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/package-info.java
deleted file mode 100644
index 1edb8fc8..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Components used by the {@link me.lib720.caprica.vlcj.player.component.CallbackMediaPlayerComponent}.
- *
- * Provides implementations of "painter" components used to render video frames.
- */
-package me.lib720.caprica.vlcj.player.component.callback;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java
deleted file mode 100644
index fe7a6b2f..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Native full-screen strategy for OSX.
- */
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.osx;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/package-info.java
deleted file mode 100644
index 72310cd2..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Events relating to media.
- */
-package me.lib720.caprica.vlcj.player.embedded.fullscreen;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java
deleted file mode 100644
index 498a71d1..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Provides default buffer format implementations.
- */
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback.format;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/events/package-info.java b/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/events/package-info.java
deleted file mode 100644
index 3bb6627e..00000000
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/events/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Media list player events.
- */
-package me.lib720.caprica.vlcj.player.list.events;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ApplicationApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ApplicationApi.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ApplicationApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ApplicationApi.java
index fb0e20e6..aa3b04cf 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ApplicationApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ApplicationApi.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_module_description_t;
-import me.lib720.caprica.vlcj.log.NativeLog;
-import me.lib720.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_module_description_t;
+import uk.co.caprica.vlcj.log.NativeLog;
+import uk.co.caprica.vlcj.media.TrackType;
import java.util.ArrayList;
import java.util.List;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/AudioApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/AudioApi.java
similarity index 79%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/AudioApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/AudioApi.java
index 6db53273..0af6eb43 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/AudioApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/AudioApi.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.NativeString;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_audio_output_device_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_audio_output_t;
-import me.lib720.caprica.vlcj.player.base.AudioDevice;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_audio_output_device_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_audio_output_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.AudioDevice;
import java.util.ArrayList;
import java.util.List;
@@ -51,8 +51,8 @@ public List
* When using VLC options/arguments to initialise the factory, generally any options that enable/disable modules (e.g.
* video/audio filters) must be set via the factory instance and not when invoking
- * {@link me.lib720.caprica.vlcj.player.base.MediaApi#play(URL, String...)}. However, the module-specific
+ * {@link uk.co.caprica.vlcj.player.base.MediaApi#play(URL, String...)}. However, the module-specific
* options may be able to be passed as media options and be effective via that play call.
*
* The factory will attempt to automatically discover the location of the required LibVLC native library, so it should
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ModuleDescription.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ModuleDescription.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ModuleDescription.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ModuleDescription.java
index 5bbef2e9..c753c91a 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/ModuleDescription.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/ModuleDescription.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
/**
* Description of a module (e.g. audio/video filter).
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryMappingException.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryMappingException.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryMappingException.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryMappingException.java
index 93e2a085..7c1a049a 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryMappingException.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryMappingException.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
/**
* Exception thrown if not all methods in the native library could be mapped at run-time.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryPath.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryPath.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryPath.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryPath.java
index c4fc9191..63a3dea1 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/NativeLibraryPath.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/NativeLibraryPath.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
/**
* Utility class to help determine the native library search path.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/RendererApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/RendererApi.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/RendererApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/RendererApi.java
index 7a131316..8e9fa722 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/RendererApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/RendererApi.java
@@ -17,17 +17,17 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
import com.sun.jna.Pointer;
import com.sun.jna.Structure;
import com.sun.jna.ptr.PointerByReference;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_rd_description_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_renderer_discoverer_t;
-import me.lib720.caprica.vlcj.binding.support.size_t;
-import me.lib720.caprica.vlcj.player.renderer.RendererDiscoverer;
-import me.lib720.caprica.vlcj.player.renderer.RendererDiscovererDescription;
+import uk.co.caprica.vlcj.binding.internal.libvlc_rd_description_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_renderer_discoverer_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.types.size_t;
+import uk.co.caprica.vlcj.player.renderer.RendererDiscoverer;
+import uk.co.caprica.vlcj.player.renderer.RendererDiscovererDescription;
import java.util.ArrayList;
import java.util.List;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/VideoSurfaceApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/VideoSurfaceApi.java
similarity index 81%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/VideoSurfaceApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/VideoSurfaceApi.java
index cd9be253..dce5d39e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/VideoSurfaceApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/VideoSurfaceApi.java
@@ -17,14 +17,14 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.ComponentIdVideoSurface;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.ComponentVideoSurface;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.ComponentIdVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.ComponentVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/NativeDiscovery.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/NativeDiscovery.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/NativeDiscovery.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/NativeDiscovery.java
index 09faa6b2..55c476c1 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/NativeDiscovery.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/NativeDiscovery.java
@@ -1,20 +1,20 @@
-package me.lib720.caprica.vlcj.factory.discovery;
+package uk.co.caprica.vlcj.factory.discovery;
import com.sun.jna.NativeLibrary;
import com.sun.jna.StringArray;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.factory.discovery.strategy.LinuxNativeDiscoveryStrategy;
-import me.lib720.caprica.vlcj.factory.discovery.strategy.NativeDiscoveryStrategy;
-import me.lib720.caprica.vlcj.factory.discovery.strategy.OsxNativeDiscoveryStrategy;
-import me.lib720.caprica.vlcj.factory.discovery.strategy.WindowsNativeDiscoveryStrategy;
-import me.lib720.caprica.vlcj.support.version.LibVlcVersion;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.discovery.strategy.LinuxNativeDiscoveryStrategy;
+import uk.co.caprica.vlcj.factory.discovery.strategy.NativeDiscoveryStrategy;
+import uk.co.caprica.vlcj.factory.discovery.strategy.OsxNativeDiscoveryStrategy;
+import uk.co.caprica.vlcj.factory.discovery.strategy.WindowsNativeDiscoveryStrategy;
+import uk.co.caprica.vlcj.support.version.LibVlcVersion;
import java.lang.ref.Reference;
import java.lang.reflect.Field;
@@ -119,7 +119,7 @@ public final boolean discover() {
String path = discoveryStrategy.discover();
if (path != null) {
if (discoveryStrategy.onFound(path)) {
- NativeLibrary.addSearchPath(RuntimeUtil.getLibVlcLibraryName(), path);
+ NativeLibrary.addSearchPath(VideoLan4J.LIBVLC_NAME, path);
}
tryPluginPath(path, discoveryStrategy);
if (tryLoadingLibrary()) {
@@ -166,10 +166,10 @@ public boolean attemptFix() {
Map
- * Applications can easily provide their own {@link me.lib720.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider}
+ * Applications can easily provide their own {@link uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider}
* implementations and register the fully-qualified classnames of those implementations in the services descriptor file
* located at
+ * Most applications should start with the {@link uk.co.caprica.vlcj.factory.MediaPlayerFactory}.
+ */
+package uk.co.caprica.vlcj;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/AudioApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/AudioApi.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/AudioApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/AudioApi.java
index f96d7ba3..fc742471 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/AudioApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/AudioApi.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.NativeString;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_audio_output_device_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_equalizer_t;
-import me.lib720.caprica.vlcj.player.base.callback.AudioCallback;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_audio_output_device_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_equalizer_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.callback.AudioCallback;
import java.util.ArrayList;
import java.util.List;
@@ -61,7 +61,7 @@ public final class AudioApi extends BaseApi implements EqualizerListener {
*
* The change will not be applied until the media player has been stopped and then played again.
*
- * The output name comes from {@link me.lib720.caprica.vlcj.factory.AudioApi#audioOutputs()}.
+ * The output name comes from {@link uk.co.caprica.vlcj.factory.AudioApi#audioOutputs()}.
*
* @param output name of the desired audio output
* @return
* The change will not be applied until the media player has been stopped and then played again.
*
- * The output name comes from {@link me.lib720.caprica.vlcj.factory.AudioApi#audioOutputs()}.
+ * The output name comes from {@link uk.co.caprica.vlcj.factory.AudioApi#audioOutputs()}.
*
* The device id comes from the {@link AudioDevice#getDeviceId()} returned by
- * {@link me.lib720.caprica.vlcj.factory.AudioApi#audioOutputs()}.
+ * {@link uk.co.caprica.vlcj.factory.AudioApi#audioOutputs()}.
*
* @param output name of the desired audio output
* @param outputDeviceId id of the desired audio output device
@@ -109,8 +109,8 @@ public List
+ * Provides implementations of "painter" components used to render video frames.
+ */
+package uk.co.caprica.vlcj.player.component.callback;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java
similarity index 99%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java
index 0d2043b8..9ba0ff1b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/AbstractJWindowOverlayComponent.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component.overlay;
+package uk.co.caprica.vlcj.player.component.overlay;
import com.sun.jna.platform.WindowUtils;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/package-info.java
similarity index 66%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/package-info.java
index 39a9c08d..188dadda 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/overlay/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/overlay/package-info.java
@@ -1,4 +1,4 @@
/**
* Provides higher-level components used to create overlays for use with embedded media player components.
*/
-package me.lib720.caprica.vlcj.player.component.overlay;
+package uk.co.caprica.vlcj.player.component.overlay;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/package-info.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/package-info.java
index 15350e52..cbf37df3 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/package-info.java
@@ -4,4 +4,4 @@
* Generally, all media player components will accept
* This strategy is not recommended.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.exclusivemode;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.exclusivemode;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java
index a8d969d0..8991f409 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/LibVlcNativeFullScreenStrategy.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.libvlc;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.libvlc;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_player_t;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_player_t;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
/**
* Implementation of a {@link FullScreenStrategy} that uses the native LibVLC fullscreen API.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java
similarity index 76%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java
index e0acb1ec..233b4afd 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/libvlc/package-info.java
@@ -4,4 +4,4 @@
* This strategy only works where the video surface is not embedded in your application (i.e. you allow VLC to
* create the video window).
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.libvlc;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.libvlc;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java
index 3ebd8fe6..c1f3e6cd 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/OsxFullScreenStrategy.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.osx;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.osx;
import com.apple.eawt.AppEvent.FullScreenEvent;
import com.apple.eawt.Application;
import com.apple.eawt.FullScreenAdapter;
import com.apple.eawt.FullScreenUtilities;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java
new file mode 100644
index 00000000..fb3ab529
--- /dev/null
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/osx/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Native full-screen strategy for OSX.
+ */
+package uk.co.caprica.vlcj.player.embedded.fullscreen.osx;
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/package-info.java
new file mode 100644
index 00000000..c63b5de4
--- /dev/null
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Events relating to media.
+ */
+package uk.co.caprica.vlcj.player.embedded.fullscreen;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java
index ae51a760..790176dd 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/UnsupportedFullScreenStrategy.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.unsupported;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.unsupported;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
/**
* Simple do-nothing implementation of a full-screen strategy.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java
similarity index 62%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java
index 9cd9451e..feef8259 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/unsupported/package-info.java
@@ -1,4 +1,4 @@
/**
* A do-nothing full-screen strategy implementation to explicitly and completely disable full-screen support.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.unsupported;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.unsupported;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java
index 3ff01506..85f7de65 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/ExtendedUser32.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.windows;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.windows;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java
index e476a33a..64ac670e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenHandler.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.windows;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.windows;
import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.User32;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java
index 4a700b65..3a83de11 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/Win32FullScreenStrategy.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.windows;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.windows;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java
index 3802965a..eb7c2d92 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/WindowState.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.windows;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.windows;
/**
* Encapsulation of window state.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java
similarity index 73%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java
index 4ca6b386..b984e47d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/windows/package-info.java
@@ -3,4 +3,4 @@
* PACKAGE WAS PATCHED.
* Implementation on old Forge versions is busted, so we need to break everything to keep support ahead
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.windows;
\ No newline at end of file
+package uk.co.caprica.vlcj.player.embedded.fullscreen.windows;
\ No newline at end of file
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java
index fc48f149..4faeb733 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenHandler.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.x;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.x;
import com.sun.jna.Native;
import com.sun.jna.NativeLong;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java
index 62853151..4fb3ede2 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/XFullScreenStrategy.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.x;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.x;
-import me.lib720.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/package-info.java
similarity index 51%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/package-info.java
index e20ffdc6..0931b4e9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/x/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/x/package-info.java
@@ -1,4 +1,4 @@
/**
* Native full-screen strategy for the X Window System.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.x;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.x;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/package-info.java
similarity index 75%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/package-info.java
index 3922d6a7..e5380a26 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/package-info.java
@@ -2,4 +2,4 @@
* Provides the classes necessary to support the embedding of native media player video output in Swing/AWT user
* interface components.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java
index 4dcdc547..41e5fb2b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/AWTVideoSurface.java
@@ -17,11 +17,11 @@
* Copyright 2009-2020 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import com.sun.jna.Native;
-import me.lib720.caprica.vlcj.binding.LibX11;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.binding.lib.LibX11;
import java.awt.*;
@@ -52,7 +52,7 @@ abstract class AWTVideoSurface extends VideoSurface {
* One-time initialisation.
*/
static {
- if (RuntimeUtil.isNix()) {
+ if (Platform.isLinux()) {
LibX11.INSTANCE.XInitThreads();
System.loadLibrary("jawt");
}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java
index 64bf0aad..add78f23 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ByteBufferFactory.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import sun.misc.Unsafe;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java
similarity index 89%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java
index 9f23a211..13dfd247 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/CallbackVideoSurface.java
@@ -17,17 +17,21 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.*;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.binding.internal.libvlc_display_callback_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_lock_callback_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_unlock_callback_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_video_cleanup_cb;
+import uk.co.caprica.vlcj.binding.internal.libvlc_video_format_cb;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a video surface that uses native callbacks to receive video frame data for rendering.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java
index 5498570e..b5d1c67d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentIdVideoSurface.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Encapsulation of a video surface that wraps the native component id of the video surface
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java
similarity index 83%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java
index c9b9aef7..99758860 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/ComponentVideoSurface.java
@@ -17,12 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import com.sun.jna.Native;
-import me.lib720.caprica.vlcj.binding.OsxComponentId;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
import java.awt.*;
@@ -68,11 +66,6 @@ public void attach(MediaPlayer mediaPlayer) {
}
private long getComponentId(Component component) {
- if (!RuntimeUtil.isMac()) {
- return Native.getComponentID(component);
- } else {
- return OsxComponentId.getOsxComponentId(component);
- }
+ return Native.getComponentID(component);
}
-
}
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java
index 8885301c..0c4dd127 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/DeferredComponentIdVideoSurface.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Encapsulation of a video surface that wraps the native component id of the video surface component - the component id
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java
index 5a94631d..e69b848c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/LinuxVideoSurfaceAdapter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a video surface adapter for Linux.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java
index 81db6fcc..10cb9ef5 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/NativeBuffers.java
@@ -17,15 +17,15 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import com.sun.jna.NativeLong;
+import com.sun.jna.Platform;
import com.sun.jna.Pointer;
-import me.lib720.caprica.vlcj.binding.Kernel32;
-import me.lib720.caprica.vlcj.binding.LibC;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.binding.support.size_t;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
+import uk.co.caprica.vlcj.binding.lib.Kernel32;
+import uk.co.caprica.vlcj.binding.lib.LibC;
+import uk.co.caprica.vlcj.binding.lib.types.size_t;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
import java.nio.ByteBuffer;
@@ -75,7 +75,7 @@ int allocate(BufferFormat bufferFormat) {
nativeBuffers[i] = buffer;
pointers[i] = Pointer.createConstant(ByteBufferFactory.getAddress(buffer));
if (lockBuffers) {
- if (!RuntimeUtil.isWindows()) {
+ if (!Platform.isWindows()) {
LibC.INSTANCE.mlock(pointers[i], new NativeLong(buffer.capacity()));
} else {
Kernel32.INSTANCE.VirtualLock(pointers[i], new size_t(buffer.capacity()));
@@ -89,7 +89,7 @@ void free() {
if (nativeBuffers != null) {
if (lockBuffers) {
for (int i = 0; i < nativeBuffers.length; i++) {
- if (!RuntimeUtil.isWindows()) {
+ if (!Platform.isWindows()) {
LibC.INSTANCE.munlock(pointers[i], new NativeLong(nativeBuffers[i].capacity()));
} else {
Kernel32.INSTANCE.VirtualUnlock(pointers[i], new size_t(nativeBuffers[i].capacity()));
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java
index dd761010..c16fedbc 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/OsxVideoSurfaceAdapter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a video surface adapter for Mac.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurface.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurface.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurface.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurface.java
index 4e296385..996f0f94 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurface.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurface.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Encapsulation of a video surface.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java
index 476b67c9..013dba2e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
import java.io.Serializable;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java
index c647f93e..793715fc 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/VideoSurfaceAdapters.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
+import com.sun.jna.Platform;
/**
* Utility class to create a {@link VideoSurfaceAdapter} for the current run-time operating system.
@@ -35,11 +35,11 @@ private VideoSurfaceAdapters() {
* @return video surface adapter
*/
public static VideoSurfaceAdapter getVideoSurfaceAdapter() {
- if (RuntimeUtil.isNix()) {
+ if (Platform.isLinux()) {
return new LinuxVideoSurfaceAdapter();
- } else if (RuntimeUtil.isWindows()) {
+ } else if (Platform.isWindows()) {
return new WindowsVideoSurfaceAdapter();
- } else if (RuntimeUtil.isMac()) {
+ } else if (Platform.isMac()) {
return new OsxVideoSurfaceAdapter();
} else {
throw new RuntimeException("Unable to create a video surface - failed to detect a supported operating system");
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java
index 9cfedc1c..eed21b17 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/WindowsVideoSurfaceAdapter.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
import com.sun.jna.Pointer;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a video surface adapter for Windows.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java
index 9b776573..21227b9a 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormat.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
import java.util.Arrays;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java
similarity index 88%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java
index 3cf328c6..73959de6 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallback.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
import java.nio.ByteBuffer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java
index 80668783..f13418fd 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/BufferFormatCallbackAdapter.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
import java.nio.ByteBuffer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java
index a5adbfbe..edb77e14 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallback.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
import java.nio.ByteBuffer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java
index 7ec85f22..a6882163 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/RenderCallbackAdapter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
import java.nio.ByteBuffer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java
index 345a387e..447ffee8 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/SimpleBufferFormatCallback.java
@@ -1,6 +1,6 @@
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface;
// WATERMeDIA PATCH
public interface SimpleBufferFormatCallback {
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java
similarity index 88%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java
index b47ec5e1..5916cde0 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/RV32BufferFormat.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback.format;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback.format;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
/**
* Implementation of a buffer format for RV32.
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java
new file mode 100644
index 00000000..88216307
--- /dev/null
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/format/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides default buffer format implementations.
+ */
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback.format;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/package-info.java
similarity index 63%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/package-info.java
index eb0e0237..8783dd43 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/callback/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/callback/package-info.java
@@ -1,4 +1,4 @@
/**
* Full-screen strategy implementation that picks the best available depending on the run-time operating system.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface.callback;
+package uk.co.caprica.vlcj.player.embedded.videosurface.callback;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/package-info.java
similarity index 63%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/package-info.java
index c0576c18..70113019 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/videosurface/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/videosurface/package-info.java
@@ -2,4 +2,4 @@
* Provides the classes necessary to create user interface components that
* render native video.
*/
-package me.lib720.caprica.vlcj.player.embedded.videosurface;
+package uk.co.caprica.vlcj.player.embedded.videosurface;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/BaseApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/BaseApi.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/BaseApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/BaseApi.java
index 74ad766f..72bcd9cc 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/BaseApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/BaseApi.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_list_player_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_list_player_t;
/**
* Internal base implementation.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ControlsApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ControlsApi.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ControlsApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ControlsApi.java
index c4591679..474e6820 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ControlsApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ControlsApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
/**
* Behaviour pertaining to media list player controls, like play, pause, stop of the list as a whole, play a specific
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/EventApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/EventApi.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/EventApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/EventApi.java
index 5468afbf..bf8836d8 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/EventApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/EventApi.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
/**
* Behaviour pertaining to media list player events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ListApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ListApi.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ListApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ListApi.java
index 03de2168..8fc0cd6d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/ListApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/ListApi.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.medialist.EventApi;
-import me.lib720.caprica.vlcj.medialist.MediaApi;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListRef;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.medialist.EventApi;
+import uk.co.caprica.vlcj.medialist.MediaApi;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListRef;
/**
* Behaviour pertaining to the list of media items.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayer.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayer.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayer.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayer.java
index 82bf15f9..146a2ff8 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayer.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayer.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_list_player_t;
-import me.lib720.caprica.vlcj.support.eventmanager.TaskExecutor;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_list_player_t;
+import uk.co.caprica.vlcj.support.eventmanager.TaskExecutor;
/**
* Implementation of a media list player.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java
index a7bd1dd5..10b8849e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventAdapter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.media.MediaRef;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventListener.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventListener.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventListener.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventListener.java
index db8d22a2..9838a8a7 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerEventListener.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerEventListener.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.media.MediaRef;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java
similarity index 73%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java
index 68f30145..41fcca77 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/list/MediaListPlayerNativeEventManager.java
@@ -17,16 +17,16 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.list;
+package uk.co.caprica.vlcj.player.list;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_e;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_manager_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.player.list.events.MediaListPlayerEventFactory;
-import me.lib720.caprica.vlcj.support.eventmanager.EventNotification;
-import me.lib720.caprica.vlcj.support.eventmanager.NativeEventManager;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_e;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_manager_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.player.list.events.MediaListPlayerEventFactory;
+import uk.co.caprica.vlcj.support.eventmanager.EventNotification;
+import uk.co.caprica.vlcj.support.eventmanager.NativeEventManager;
final public class MediaListPlayerNativeEventManager extends NativeEventManager
* This package is not public API.
*/
-package me.lib720.caprica.vlcj.support.eventmanager;
+package uk.co.caprica.vlcj.support.eventmanager;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/package-info.java
similarity index 69%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/package-info.java
index 7aac104c..e9baf0ef 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/package-info.java
@@ -1,4 +1,4 @@
/**
* Provides various support classes, not generally useful for client applications.
*/
-package me.lib720.caprica.vlcj.support;
+package uk.co.caprica.vlcj.support;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/LibVlcVersion.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/LibVlcVersion.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/LibVlcVersion.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/LibVlcVersion.java
index 935444de..08022d2f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/LibVlcVersion.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/LibVlcVersion.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.support.version;
+package uk.co.caprica.vlcj.support.version;
-import me.lib720.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
/**
* Holder for runtime LibVLC version information.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/Version.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/Version.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/Version.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/Version.java
index 5111e646..d76deef6 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/Version.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/Version.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.support.version;
+package uk.co.caprica.vlcj.support.version;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/package-info.java
similarity index 52%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/package-info.java
index 6add5b40..db015ab2 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/support/version/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/support/version/package-info.java
@@ -1,4 +1,4 @@
/**
* Provides various version-related classes.
*/
-package me.lib720.caprica.vlcj.support.version;
+package uk.co.caprica.vlcj.support.version;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/BeforeWaiterAbortedException.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/BeforeWaiterAbortedException.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/BeforeWaiterAbortedException.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/BeforeWaiterAbortedException.java
index b87fc05f..a183deb5 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/BeforeWaiterAbortedException.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/BeforeWaiterAbortedException.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
/**
* Exception thrown when a media player condition instance triggers aborts by returning true if the supplied MRL should be treated as a "location"; false for a file
- */
- static boolean isLocation(String mrl) {
- return MRL_LOCATION_PATTERN.matcher(mrl).matches();
- }
-
- /**
- * Encode, if necessary, an MRL that can be passed via the native library API.
- * META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider (in their
* own application classpath).
*/
-package me.lib720.caprica.vlcj.factory.discovery.provider;
+package uk.co.caprica.vlcj.factory.discovery.provider;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java
index f5e15a77..2b9c2800 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/BaseNativeDiscoveryStrategy.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
import java.io.File;
import java.nio.file.Files;
@@ -28,8 +28,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static me.lib720.caprica.vlcj.factory.discovery.NativeDiscovery.IT;
-import static me.lib720.caprica.vlcj.factory.discovery.NativeDiscovery.LOGGER;
+import static uk.co.caprica.vlcj.factory.discovery.NativeDiscovery.IT;
+import static uk.co.caprica.vlcj.factory.discovery.NativeDiscovery.LOGGER;
/**
* Base implementation of a native discovery strategy that searches a list of directories for a list of files.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
index c24359c3..89adb7b9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/LinuxNativeDiscoveryStrategy.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
-import me.lib720.caprica.vlcj.binding.LibC;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.binding.lib.LibC;
+import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
/**
* Default implementation of a native discovery strategy that searches directories on the Linux operating system.
@@ -44,7 +44,7 @@ public LinuxNativeDiscoveryStrategy() {
@Override
public boolean supported() {
- return RuntimeUtil.isNix();
+ return Platform.isLinux();
}
@Override
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java
index fbb2d2f5..212e286e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/NativeDiscoveryStrategy.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
/**
* Specification for a component that can locate the LibVLC native libraries at run-time.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
similarity index 81%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
index 1db10530..b53c6f6c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/OsxNativeDiscoveryStrategy.java
@@ -17,12 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
import com.sun.jna.NativeLibrary;
-import me.lib720.caprica.vlcj.binding.LibC;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.lib.LibC;
+import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
/**
* Default implementation of a native discovery strategy that searches directories on the OSX operating system.
@@ -47,7 +48,7 @@ public OsxNativeDiscoveryStrategy() {
@Override
public boolean supported() {
- return RuntimeUtil.isMac();
+ return Platform.isMac();
}
@Override
@@ -63,8 +64,8 @@ public boolean onFound(String path) {
* @param path
*/
private void forceLoadLibVlcCore(String path) {
- NativeLibrary.addSearchPath(RuntimeUtil.getLibVlcCoreLibraryName(), path);
- NativeLibrary.getInstance(RuntimeUtil.getLibVlcCoreLibraryName());
+ NativeLibrary.addSearchPath(VideoLan4J.LIBVLC_NAME, path);
+ NativeLibrary.getInstance(VideoLan4J.LIBVLCCORE_NAME);
}
@Override
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
index 8984ee42..d400076b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/WindowsNativeDiscoveryStrategy.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
-import me.lib720.caprica.vlcj.binding.LibC;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.binding.lib.LibC;
+import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy;
/**
* Default implementation of a native discovery strategy that searches directories on the Windows operating system.
@@ -44,7 +44,7 @@ public WindowsNativeDiscoveryStrategy() {
@Override
public boolean supported() {
- return RuntimeUtil.isWindows();
+ return Platform.isWindows();
}
@Override
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/package-info.java
similarity index 75%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/package-info.java
index 3b825fe7..89617a31 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/discovery/strategy/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/discovery/strategy/package-info.java
@@ -2,4 +2,4 @@
* Provides default implementations of components that can be used to automatically discover the location of the LibVLC
* native libraries for each supported operating system.
*/
-package me.lib720.caprica.vlcj.factory.discovery.strategy;
+package uk.co.caprica.vlcj.factory.discovery.strategy;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/package-info.java
similarity index 82%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/package-info.java
index ca34974c..f538888a 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/factory/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/factory/package-info.java
@@ -4,4 +4,4 @@
* The factory is likely the first component client applications will use, it loads the native library and creates new
* media player components,
*/
-package me.lib720.caprica.vlcj.factory;
+package uk.co.caprica.vlcj.factory;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogEventListener.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogEventListener.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogEventListener.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogEventListener.java
index 9547a27b..7ad5607f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogEventListener.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogEventListener.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.log;
+package uk.co.caprica.vlcj.log;
/**
* Specification for a component that will receive native log messages.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogLevel.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogLevel.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogLevel.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogLevel.java
index 53a75366..ad55641c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/LogLevel.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/LogLevel.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.log;
+package uk.co.caprica.vlcj.log;
import java.util.HashMap;
import java.util.Map;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/NativeLog.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/NativeLog.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/NativeLog.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/NativeLog.java
index 15076f2c..cc8393e0 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/NativeLog.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/NativeLog.java
@@ -17,19 +17,19 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.log;
+package uk.co.caprica.vlcj.log;
import com.sun.jna.CallbackThreadInitializer;
import com.sun.jna.Native;
import com.sun.jna.Pointer;
import com.sun.jna.ptr.IntByReference;
import com.sun.jna.ptr.PointerByReference;
-import me.lib720.caprica.vlcj.binding.LibC;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.NativeString;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_log_cb;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_log_t;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_log_cb;
+import uk.co.caprica.vlcj.binding.internal.libvlc_log_t;
+import uk.co.caprica.vlcj.binding.lib.LibC;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
import java.nio.ByteBuffer;
import java.util.List;
@@ -201,7 +201,7 @@ public void log(Pointer data, int level, libvlc_log_t ctx, String format, Pointe
private String getString(PointerByReference pointer) {
// The string is copied but not freed, the native string will be reclaimed when the native callback returns
Pointer value = pointer.getValue();
- return value != null ? NativeString.copyNativeString(value) : null;
+ return value != null ? VideoLan4J.copyNativeString(value) : null;
}
/**
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/package-info.java
similarity index 52%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/package-info.java
index f41fdb40..dc04e955 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/log/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/log/package-info.java
@@ -1,4 +1,4 @@
/**
* Native LibVLC log component.
*/
-package me.lib720.caprica.vlcj.log;
+package uk.co.caprica.vlcj.log;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/AudioTrackInfo.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/AudioTrackInfo.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/AudioTrackInfo.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/AudioTrackInfo.java
index 1a426d1f..55abc975 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/AudioTrackInfo.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/AudioTrackInfo.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
/**
* Audio track info.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/BaseApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/BaseApi.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/BaseApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/BaseApi.java
index 555182ae..b6feb523 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/BaseApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/BaseApi.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_t;
/**
* Internal base implementation.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/EventApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/EventApi.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/EventApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/EventApi.java
index 95de77f0..ca582e33 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/EventApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/EventApi.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
/**
* Behaviour pertaining to media events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/InfoApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/InfoApi.java
similarity index 78%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/InfoApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/InfoApi.java
index 3965c833..18c6e22c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/InfoApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/InfoApi.java
@@ -17,20 +17,15 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.binding.NativeString;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_stats_t;
-import me.lib720.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_stats_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.player.base.State;
import java.util.List;
-import static me.lib720.caprica.vlcj.binding.LibVlc.libvlc_media_get_duration;
-import static me.lib720.caprica.vlcj.binding.LibVlc.libvlc_media_get_mrl;
-import static me.lib720.caprica.vlcj.binding.LibVlc.libvlc_media_get_state;
-import static me.lib720.caprica.vlcj.binding.LibVlc.libvlc_media_get_stats;
-import static me.lib720.caprica.vlcj.binding.LibVlc.libvlc_media_get_type;
-
/**
* Behaviour pertaining to media information, providing things like the media resource locator, type, state and duration
* of this media. Also provides access to the various media tracks and playback statistics.
@@ -49,7 +44,7 @@ public final class InfoApi extends BaseApi {
* @return media resource locator
*/
public String mrl() {
- return NativeString.copyAndFreeNativeString(libvlc_media_get_mrl(mediaInstance));
+ return VideoLan4J.copyAndFreeNativeString(LibVlc.libvlc_media_get_mrl(mediaInstance));
}
/**
@@ -58,7 +53,7 @@ public String mrl() {
* @return media type
*/
public MediaType type() {
- return MediaType.mediaType(libvlc_media_get_type(mediaInstance));
+ return MediaType.mediaType(LibVlc.libvlc_media_get_type(mediaInstance));
}
/**
@@ -67,7 +62,7 @@ public MediaType type() {
* @return state
*/
public State state() {
- return State.state(libvlc_media_get_state(mediaInstance));
+ return State.state(LibVlc.libvlc_media_get_state(mediaInstance));
}
/**
@@ -76,7 +71,7 @@ public State state() {
* @return duration, milliseconds
*/
public long duration() {
- return libvlc_media_get_duration(mediaInstance);
+ return LibVlc.libvlc_media_get_duration(mediaInstance);
}
/**
@@ -126,7 +121,7 @@ public Listtrue if the statistics were updated; false on error
*/
public boolean statistics(MediaStatistics mediaStatistics) {
- if (libvlc_media_get_stats(mediaInstance, statsInstance) != 0) {
+ if (LibVlc.libvlc_media_get_stats(mediaInstance, statsInstance) != 0) {
mediaStatistics.apply(statsInstance);
return true;
} else {
@@ -140,7 +135,7 @@ public boolean statistics(MediaStatistics mediaStatistics) {
* @return media statistics, or null on error
*/
public MediaStatistics statistics() {
- if (libvlc_media_get_stats(mediaInstance, statsInstance) != 0) {
+ if (LibVlc.libvlc_media_get_stats(mediaInstance, statsInstance) != 0) {
MediaStatistics mediaStatistics = new MediaStatistics();
mediaStatistics.apply(statsInstance);
return mediaStatistics;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/Media.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/Media.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/Media.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/Media.java
index a128306a..42616798 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/Media.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/Media.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_t;
/**
* Encapsulation of a native media instance.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventAdapter.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventAdapter.java
index bb9cfed9..fbe0dfc3 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventAdapter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.base.State;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventListener.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventListener.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventListener.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventListener.java
index 464c4b05..d370c521 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaEventListener.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaEventListener.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.base.State;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaFactory.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaFactory.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaFactory.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaFactory.java
index a30372fb..12b201e2 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaFactory.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaFactory.java
@@ -17,12 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_t;
-import me.lib720.caprica.vlcj.media.callback.CallbackMedia;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.media.callback.CallbackMedia;
import java.net.URL;
@@ -233,10 +234,7 @@ public static Media duplicateMedia(libvlc_instance_t libvlcInstance, Media media
}
private static libvlc_media_t newMediaInstance(libvlc_instance_t libvlcInstance, URL url) {
- String mrl = MediaResourceLocator.encodeMrl(url);
- return MediaResourceLocator.isLocation(mrl) ?
- LibVlc.libvlc_media_new_location(libvlcInstance, mrl) :
- LibVlc.libvlc_media_new_path(libvlcInstance, mrl);
+ return VideoLan4J.getMediaInstance(libvlcInstance, url);
}
private static libvlc_media_t newMediaInstance(libvlc_instance_t libvlcInstance, CallbackMedia callbackMedia) {
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaNativeEventManager.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaNativeEventManager.java
similarity index 72%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaNativeEventManager.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaNativeEventManager.java
index 2cd4afea..91b599b2 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/media/MediaNativeEventManager.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/media/MediaNativeEventManager.java
@@ -17,16 +17,16 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.media;
+package uk.co.caprica.vlcj.media;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_e;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_manager_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.media.events.MediaEventFactory;
-import me.lib720.caprica.vlcj.support.eventmanager.EventNotification;
-import me.lib720.caprica.vlcj.support.eventmanager.NativeEventManager;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_e;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_manager_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.media.events.MediaEventFactory;
+import uk.co.caprica.vlcj.support.eventmanager.EventNotification;
+import uk.co.caprica.vlcj.support.eventmanager.NativeEventManager;
final class MediaNativeEventManager extends NativeEventManagertrue if the output was successfully set, otherwise false
@@ -78,7 +78,7 @@ public boolean setOutput(String output) {
* @return identifier of the current audio output device, or null if not available
*/
public String outputDevice() {
- return NativeString.copyAndFreeNativeString(LibVlc.libvlc_audio_output_device_get(mediaPlayerInstance));
+ return VideoLan4J.copyAndFreeNativeString(LibVlc.libvlc_audio_output_device_get(mediaPlayerInstance));
}
/**
@@ -86,10 +86,10 @@ public String outputDevice() {
* true if successful; false on error
*/
public boolean setSubTitleFile(String subTitleFileName) {
- return setSubTitleUri(NativeUri.encodeFileUri(subTitleFileName));
+ return setSubTitleUri(subTitleFileName);
}
/**
@@ -125,7 +124,7 @@ public boolean setSubTitleFile(String subTitleFileName) {
* @return true if successful; false on error
*/
public boolean setSubTitleFile(File subTitleFile) {
- return setSubTitleUri(NativeUri.encodeFileUri(subTitleFile.getAbsolutePath()));
+ return setSubTitleUri(subTitleFile.getAbsolutePath());
}
/**
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java
index f5847b87..947202d0 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/SynchronisedOneShotMediaPlayerEventListener.java
@@ -17,7 +17,7 @@
* Copyright 2009-2020 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
import java.util.concurrent.CountDownLatch;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextApi.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextApi.java
index 1dabe524..8c436ae7 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
-import me.lib720.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
/**
* Behaviour pertaining to teletext.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextKey.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextKey.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextKey.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextKey.java
index 12f42fe6..ffe4788c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TeletextKey.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TeletextKey.java
@@ -17,7 +17,7 @@
* Copyright 2009-2017 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
import java.util.HashMap;
import java.util.Map;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleApi.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleApi.java
index 5b3a381e..77ad7462 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
-import me.lib720.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
import java.util.List;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleDescription.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleDescription.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleDescription.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleDescription.java
index efec0b69..2d159944 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TitleDescription.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TitleDescription.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
/**
* Title description.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TrackDescription.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TrackDescription.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TrackDescription.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TrackDescription.java
index 1a45b2f1..458c5e2f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/TrackDescription.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/TrackDescription.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
/**
* Description of a track, e.g. a video or audio track.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/VideoApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/VideoApi.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/VideoApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/VideoApi.java
index 2457b2f3..5044b839 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/VideoApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/VideoApi.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
import com.sun.jna.ptr.IntByReference;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.NativeString;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_video_adjust_option_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_video_viewpoint_t;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.binding.internal.libvlc_video_adjust_option_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_video_viewpoint_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
import java.awt.*;
import java.util.List;
@@ -185,7 +185,7 @@ public void setVideoTitleDisplay(Position position, int timeout) {
* @return aspect ratio
*/
public String aspectRatio() {
- return NativeString.copyAndFreeNativeString(LibVlc.libvlc_video_get_aspect_ratio(mediaPlayerInstance));
+ return VideoLan4J.copyAndFreeNativeString(LibVlc.libvlc_video_get_aspect_ratio(mediaPlayerInstance));
}
/**
@@ -221,7 +221,7 @@ public void setScale(float factor) {
* @return crop geometry
*/
public String cropGeometry() {
- return NativeString.copyAndFreeNativeString(LibVlc.libvlc_video_get_crop_geometry(mediaPlayerInstance));
+ return VideoLan4J.copyAndFreeNativeString(LibVlc.libvlc_video_get_crop_geometry(mediaPlayerInstance));
}
/**
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/Viewpoint.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/Viewpoint.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/Viewpoint.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/Viewpoint.java
index 9caa3c49..cfb6f0ac 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/Viewpoint.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/Viewpoint.java
@@ -18,10 +18,10 @@
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
-import me.lib720.caprica.vlcj.binding.LibVlc;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_video_viewpoint_t;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
+import uk.co.caprica.vlcj.binding.internal.libvlc_video_viewpoint_t;
/**
* Viewpoint for 360 degree video.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/WaitForSnapshot.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/WaitForSnapshot.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/WaitForSnapshot.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/WaitForSnapshot.java
index 4dd64970..650912c0 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/WaitForSnapshot.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/WaitForSnapshot.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
-import me.lib720.caprica.vlcj.waiter.mediaplayer.SnapshotTakenWaiter;
+import uk.co.caprica.vlcj.waiter.mediaplayer.SnapshotTakenWaiter;
import java.io.File;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallback.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallback.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallback.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallback.java
index 9883bc70..4d210610 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallback.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallback.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.callback;
+package uk.co.caprica.vlcj.player.base.callback;
import com.sun.jna.Pointer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Specification for an audio callback.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java
index 9ac24f38..624fdb74 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/AudioCallbackAdapter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.callback;
+package uk.co.caprica.vlcj.player.base.callback;
import com.sun.jna.Pointer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of an {@link AudioCallback}.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java
index 256d4e8a..3bb14376 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/DefaultAudioCallbackAdapter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.callback;
+package uk.co.caprica.vlcj.player.base.callback;
import com.sun.jna.Pointer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Default implementation of an {@link AudioCallbackAdapter}.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/package-info.java
similarity index 66%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/package-info.java
index 12311d76..0de5e98b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/callback/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/callback/package-info.java
@@ -2,4 +2,4 @@
* Provides the classes necessary to support direct access to the native audio
* samples buffer.
*/
-package me.lib720.caprica.vlcj.player.base.callback;
+package uk.co.caprica.vlcj.player.base.callback;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java
index a6a50f1a..727c7b45 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioDeviceEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_audio_device;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_audio_device;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player audio device event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java
index 9d63b6dc..e04af1d9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerAudioVolumeEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_audio_volume;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_audio_volume;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player audio volume event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java
index c9de8927..f5cd05ee 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBackwardEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player backward event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java
index 636c056e..1454758e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerBufferingEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_buffering;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_buffering;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player buffering event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java
index b3457848..2194e2de 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerChapterChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_chapter_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_chapter_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player chapter changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java
index 10eca067..ada544b5 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerCorkedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player corked event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java
similarity index 79%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java
index 0bdd7693..19fc6d0d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESAddedEvent.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_es_changed;
-import me.lib720.caprica.vlcj.media.TrackType;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_es_changed;
+import uk.co.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player elementary stream added event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java
similarity index 79%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java
index 262891fd..fdf4c4e5 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESDeletedEvent.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_es_changed;
-import me.lib720.caprica.vlcj.media.TrackType;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_es_changed;
+import uk.co.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player elementary stream deleted event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java
similarity index 79%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java
index 001a1249..042b44e9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerESSelectedEvent.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_es_changed;
-import me.lib720.caprica.vlcj.media.TrackType;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_es_changed;
+import uk.co.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player elementary stream selected event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java
index 21c5d1d7..ec998a8c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEncounteredErrorEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player encountered error event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java
index eda3279c..b03a02ef 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEndReachedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player end reached event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEvent.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEvent.java
index c380018b..76f628ae 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEvent.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.support.eventmanager.EventNotification;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.support.eventmanager.EventNotification;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Base implementation for media list player events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java
index 48deff0a..be4cf0ea 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerEventFactory.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_e;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_e;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* A factory that creates a media player event instance for a native media player event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java
index 5ab9a777..62481418 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerForwardEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player forward event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java
index b6a055fa..325f9bc7 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerLengthChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_length_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_length_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player length changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java
similarity index 74%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java
index 18a30829..a431e833 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMediaChangedEvent.java
@@ -17,15 +17,15 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
-
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_media_changed;
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+package uk.co.caprica.vlcj.player.base.events;
+
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_media_changed;
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player media changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java
index dae25dbd..5c5b59fa 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerMutedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player muted event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java
index 4f353895..d154a389 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerNothingSpecialEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player nothing special event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java
index fad94618..a0a6e25b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerOpeningEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player opening event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java
index 827001d5..fc1c8449 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausableChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_pausable_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_pausable_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player pausable changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java
index 426c4e18..1275c8cf 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPausedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player paused changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java
index 18d3b69d..8782db3b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPlayingEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player playing event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java
index 155de48b..032cf1ee 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerPositionChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_position_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_position_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player position changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java
index b6bd0769..bdc4cb5f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerReadyEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player ready event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java
index a7baec09..4a2fa353 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerScrambledChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_scrambled_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_scrambled_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player scrambled changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java
index f9f1a7fe..73fe6557 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSeekableChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_seekable_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_seekable_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player seekable changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java
index 3d665792..f53e0e5c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerSnapshotTakenEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_snapshot_taken;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_snapshot_taken;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player snapshot taken event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java
index b8ca5c59..4c728e01 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerStoppedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player stopped event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java
index ede561be..90f7828e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTimeChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_time_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_time_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player time changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java
index f6ec6b5e..21773d7d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerTitleChangedEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_title_changed;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_title_changed;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player title changed event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java
index 7cdf4aa7..f80219a4 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUncorkedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player uncorked event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java
similarity index 85%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java
index 1afb0e4e..a2a01cd7 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerUnmutedEvent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player unmuted event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java
index 95a685a6..1b2ae48d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/MediaPlayerVoutEvent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_event_t;
-import me.lib720.caprica.vlcj.binding.internal.media_player_vout;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.binding.internal.libvlc_event_t;
+import uk.co.caprica.vlcj.binding.internal.media_player_vout;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
/**
* Encapsulation of a media player video output created event.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/package-info.java
similarity index 60%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/package-info.java
index dd811617..b660d3ea 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/events/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/events/package-info.java
@@ -1,4 +1,4 @@
/**
* Components that implement full-screen behaviour for media players.
*/
-package me.lib720.caprica.vlcj.player.base.events;
+package uk.co.caprica.vlcj.player.base.events;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/package-info.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/package-info.java
index 0b611ee5..483626a8 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/base/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/base/package-info.java
@@ -2,4 +2,4 @@
* This is the main package for vlcj media player applications, providing the classes necessary to create and control
* native media players and associated resources.
*/
-package me.lib720.caprica.vlcj.player.base;
+package uk.co.caprica.vlcj.player.base;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponent.java
similarity index 90%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponent.java
index d0de8756..52818a05 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponent.java
@@ -17,13 +17,13 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListRef;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListRef;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
/**
* Implementation of an audio list player.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponentBase.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponentBase.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponentBase.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponentBase.java
index f83ed338..607c3b8e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioListPlayerComponentBase.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioListPlayerComponentBase.java
@@ -17,14 +17,14 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListEventListener;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayerEventListener;
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListEventListener;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
+import uk.co.caprica.vlcj.player.list.MediaListPlayerEventListener;
/**
* Base implementation for an audio list player.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponent.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponent.java
index e11c2309..86c9ea4f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponent.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of an audio player.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponentBase.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponentBase.java
similarity index 88%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponentBase.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponentBase.java
index 2cb07533..d861aee4 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/AudioPlayerComponentBase.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/AudioPlayerComponentBase.java
@@ -17,18 +17,18 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.media.Media;
-import me.lib720.caprica.vlcj.media.MediaEventListener;
-import me.lib720.caprica.vlcj.media.MediaParsedStatus;
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.media.Meta;
-import me.lib720.caprica.vlcj.media.Picture;
-import me.lib720.caprica.vlcj.media.TrackType;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
-import me.lib720.caprica.vlcj.player.base.State;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.media.Media;
+import uk.co.caprica.vlcj.media.MediaEventListener;
+import uk.co.caprica.vlcj.media.MediaParsedStatus;
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.media.Meta;
+import uk.co.caprica.vlcj.media.Picture;
+import uk.co.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.State;
/**
* Base implementation of an audio player.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java
index f5b45d8e..d110a04e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponent.java
@@ -17,16 +17,16 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.player.component.callback.CallbackImagePainter;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListRef;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.player.component.callback.CallbackImagePainter;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListRef;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java
index d79be27a..7655c3a6 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaListPlayerComponentBase.java
@@ -17,18 +17,18 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.player.component.callback.CallbackImagePainter;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListEventListener;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayerEventListener;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.player.component.callback.CallbackImagePainter;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListEventListener;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
+import uk.co.caprica.vlcj.player.list.MediaListPlayerEventListener;
import javax.swing.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java
index 30c11f7b..3dfb130b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/CallbackMediaPlayerComponent.java
@@ -17,18 +17,18 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.VideoLan4J;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.component.callback.CallbackImagePainter;
-import me.lib720.caprica.vlcj.player.component.callback.ScaledCallbackImagePainter;
-import me.lib720.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.*;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat;
+package uk.co.caprica.vlcj.player.component;
+
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.VideoLan4J;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.component.callback.CallbackImagePainter;
+import uk.co.caprica.vlcj.player.component.callback.ScaledCallbackImagePainter;
+import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.*;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat;
import javax.swing.*;
import java.awt.*;
@@ -164,13 +164,13 @@ public CallbackMediaPlayerComponent(MediaPlayerFactory mediaPlayerFactory, FullS
return new BufferFormatCallback() {
@Override
public void allocatedBuffers(ByteBuffer[] buffers) {
- VideoLan4J.native$checkClassLoader(mediaPlayer.getClassLoader());
+ VideoLan4J.checkClassLoader(mediaPlayer.getClassLoader());
cb.allocatedBuffers(buffers);
}
@Override
public BufferFormat getBufferFormat(int sourceWidth, int sourceHeight) {
- VideoLan4J.native$checkClassLoader(mediaPlayer.getClassLoader());
+ VideoLan4J.checkClassLoader(mediaPlayer.getClassLoader());
return cb.getBufferFormat(sourceWidth, sourceHeight);
}
};
@@ -178,7 +178,7 @@ public BufferFormat getBufferFormat(int sourceWidth, int sourceHeight) {
private RenderCallback init$buildClassLoaderSafeCallback(RenderCallback cb) {
return (mediaPlayer, nativeBuffers, bufferFormat) -> {
- VideoLan4J.native$checkClassLoader(mediaPlayer.getClassLoader());
+ VideoLan4J.checkClassLoader(mediaPlayer.getClassLoader());
cb.display(mediaPlayer, nativeBuffers, bufferFormat);
};
}
@@ -276,7 +276,7 @@ private MediaPlayerFactory initMediaPlayerFactory(MediaPlayerFactory mediaPlayer
private void initInputEvents(InputEvents inputEvents) {
if (inputEvents == null) {
- inputEvents = RuntimeUtil.isNix() || RuntimeUtil.isMac() ? InputEvents.DEFAULT : InputEvents.DISABLE_NATIVE;
+ inputEvents = Platform.isLinux() || Platform.isMac() ? InputEvents.DEFAULT : InputEvents.DISABLE_NATIVE;
}
switch (inputEvents) {
case NONE:
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java
index 7c1f87d7..29bcfc5f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponent.java
@@ -17,14 +17,14 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListRef;
-import me.lib720.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListRef;
+import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java
similarity index 84%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java
index a3a4f7d5..1aad8c02 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaListPlayerComponentBase.java
@@ -17,15 +17,15 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.medialist.MediaList;
-import me.lib720.caprica.vlcj.medialist.MediaListEventListener;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayer;
-import me.lib720.caprica.vlcj.player.list.MediaListPlayerEventListener;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.medialist.MediaList;
+import uk.co.caprica.vlcj.medialist.MediaListEventListener;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.list.MediaListPlayer;
+import uk.co.caprica.vlcj.player.list.MediaListPlayerEventListener;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java
index 6c73d3a7..a23a1352 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponent.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
import java.awt.*;
@@ -135,7 +135,7 @@ private Component initVideoSurfaceComponent(Component videoSurfaceComponent) {
private void initInputEvents(InputEvents inputEvents) {
if (inputEvents == null) {
- inputEvents = RuntimeUtil.isNix() || RuntimeUtil.isMac() ? InputEvents.DEFAULT : InputEvents.DISABLE_NATIVE;
+ inputEvents = Platform.isLinux() || Platform.isMac() ? InputEvents.DEFAULT : InputEvents.DISABLE_NATIVE;
}
switch (inputEvents) {
case NONE:
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java
index c8a205cd..c1e5d376 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/EmbeddedMediaPlayerComponentBase.java
@@ -17,12 +17,12 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.media.*;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
-import me.lib720.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.media.*;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.State;
import java.awt.event.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/InputEvents.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/InputEvents.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/InputEvents.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/InputEvents.java
index 734394c4..6cf55121 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/InputEvents.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/InputEvents.java
@@ -1,4 +1,4 @@
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
/**
* Enumeration of flags for controller input (mouse and keyboard) event handling for the video surface.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponent.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponent.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponent.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponent.java
index c1e2ee4b..86bb85ed 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponent.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponent.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
/**
* Minimal specification for a media player component.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java
similarity index 94%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java
index 725f1741..080fac88 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerComponentDefaults.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
/**
* Consolidated VLC command-line options/switches/arguments used by default in the media player components when creating
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerSpecs.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerSpecs.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerSpecs.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerSpecs.java
index bf87b6fd..fd0aee13 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/MediaPlayerSpecs.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/MediaPlayerSpecs.java
@@ -17,15 +17,15 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component;
-
-import me.lib720.caprica.vlcj.player.component.callback.CallbackImagePainter;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.adaptive.AdaptiveFullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.unsupported.UnsupportedFullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+package uk.co.caprica.vlcj.player.component;
+
+import uk.co.caprica.vlcj.player.component.callback.CallbackImagePainter;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.adaptive.AdaptiveFullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.unsupported.UnsupportedFullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/CallbackImagePainter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/CallbackImagePainter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/CallbackImagePainter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/CallbackImagePainter.java
index 91a74e27..aaa44bd7 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/CallbackImagePainter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/CallbackImagePainter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component.callback;
+package uk.co.caprica.vlcj.player.component.callback;
-import me.lib720.caprica.vlcj.player.component.CallbackMediaPlayerComponent;
+import uk.co.caprica.vlcj.player.component.CallbackMediaPlayerComponent;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java
index 0bc9c488..567b2856 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FilledCallbackImagePainter.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component.callback;
+package uk.co.caprica.vlcj.player.component.callback;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java
index 86667ec9..060933ee 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/FixedCallbackImagePainter.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component.callback;
+package uk.co.caprica.vlcj.player.component.callback;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java
index c9cff5f4..de09535f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/ScaledCallbackImagePainter.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.component.callback;
+package uk.co.caprica.vlcj.player.component.callback;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/package-info.java
new file mode 100644
index 00000000..9798fee9
--- /dev/null
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/component/callback/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Components used by the {@link uk.co.caprica.vlcj.player.component.CallbackMediaPlayerComponent}.
+ * null values for any of their constructor parameters
* and provide reasonable defaults.
*/
-package me.lib720.caprica.vlcj.player.component;
+package uk.co.caprica.vlcj.player.component;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/BaseApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/BaseApi.java
similarity index 87%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/BaseApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/BaseApi.java
index b253acce..d679d721 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/BaseApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/BaseApi.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_player_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_player_t;
/**
* Internal base implementation.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java
index a8fe7aee..7fbd8e5c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/EmbeddedMediaPlayer.java
@@ -17,11 +17,11 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_instance_t;
-import me.lib720.caprica.vlcj.binding.internal.libvlc_media_player_t;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.binding.internal.libvlc_instance_t;
+import uk.co.caprica.vlcj.binding.internal.libvlc_media_player_t;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a media player that renders video to an video surface embedded in the application user interface.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/FullScreenApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/FullScreenApi.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/FullScreenApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/FullScreenApi.java
index 2f8a6524..02741ad9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/FullScreenApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/FullScreenApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
/**
* Behaviour pertaining to full-screen functionality.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/InputApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/InputApi.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/InputApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/InputApi.java
index 8dc94a78..277e3423 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/InputApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/InputApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.binding.LibVlc;
+import uk.co.caprica.vlcj.binding.lib.LibVlc;
/**
* Behaviour pertaining to keyboard/mouse input-events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/OverlayApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/OverlayApi.java
similarity index 98%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/OverlayApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/OverlayApi.java
index eb57be01..67275305 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/OverlayApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/OverlayApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.ComponentVideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.ComponentVideoSurface;
import javax.swing.*;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/VideoSurfaceApi.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/VideoSurfaceApi.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/VideoSurfaceApi.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/VideoSurfaceApi.java
index 718062ac..83c31adb 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/VideoSurfaceApi.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/VideoSurfaceApi.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded;
+package uk.co.caprica.vlcj.player.embedded;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.VideoSurface;
+import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurface;
/**
* Behaviour pertaining to the video surface.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java
similarity index 95%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java
index b715a6b3..e69357b4 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/FullScreenStrategy.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen;
+package uk.co.caprica.vlcj.player.embedded.fullscreen;
/**
* Specification for a full-screen strategy implementation.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java
similarity index 80%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java
index 58dcee4f..86eb2046 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/AdaptiveFullScreenStrategy.java
@@ -17,14 +17,14 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.adaptive;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.adaptive;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.exclusivemode.ExclusiveModeFullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.osx.OsxFullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.windows.Win32FullScreenStrategy;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.x.XFullScreenStrategy;
+import com.sun.jna.Platform;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.exclusivemode.ExclusiveModeFullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.osx.OsxFullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.windows.Win32FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.x.XFullScreenStrategy;
import java.awt.*;
@@ -86,11 +86,11 @@ protected void onAfterExitFullScreen() {
}
private FullScreenStrategy getStrategy(Window window) {
- if (RuntimeUtil.isNix()) {
+ if (Platform.isLinux()) {
return new XFullScreenStrategy(window);
- } else if (RuntimeUtil.isWindows()) {
+ } else if (Platform.isWindows()) {
return new Win32FullScreenStrategy(window);
- } else if (RuntimeUtil.isMac()) {
+ } else if (Platform.isMac()) {
return new OsxFullScreenStrategy(window);
} else {
return new ExclusiveModeFullScreenStrategy(window);
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java
similarity index 64%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java
index 99c848fa..d7ef1192 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/adaptive/package-info.java
@@ -1,4 +1,4 @@
/**
* Full-screen strategy implementation that picks the best available depending on the run-time operating system.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.adaptive;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.adaptive;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java
index b6237cc5..f8ddc664 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/ExclusiveModeFullScreenStrategy.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.player.embedded.fullscreen.exclusivemode;
+package uk.co.caprica.vlcj.player.embedded.fullscreen.exclusivemode;
-import me.lib720.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
+import uk.co.caprica.vlcj.player.embedded.fullscreen.FullScreenStrategy;
import java.awt.*;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java
similarity index 62%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java
index 376407ce..31cf4698 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/player/embedded/fullscreen/exclusivemode/package-info.java
@@ -3,4 +3,4 @@
* null and if so will be ignored
*/
public final void raiseEvent(EventNotificationfalse in an
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/ResultStatus.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/ResultStatus.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/ResultStatus.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/ResultStatus.java
index c80e759c..21808f82 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/ResultStatus.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/ResultStatus.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
/**
* Enumeration of result status.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java
index b74b458f..462d1eba 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterErrorException.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
/**
* Exception thrown when a media player condition instance triggers in response to an error.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java
similarity index 96%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java
index 6790dc0a..ce6a59c3 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/UnexpectedWaiterFinishedException.java
@@ -17,7 +17,7 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
/**
* Exception thrown when a media player condition instance triggers in response to the media finishing (reaching the
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/Waiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/Waiter.java
similarity index 97%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/Waiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/Waiter.java
index 4beb3bcb..eda2f493 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/Waiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/Waiter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
-import me.lib720.caprica.vlcj.waiter.media.MediaWaiter;
-import me.lib720.caprica.vlcj.waiter.mediaplayer.MediaPlayerWaiter;
+import uk.co.caprica.vlcj.waiter.media.MediaWaiter;
+import uk.co.caprica.vlcj.waiter.mediaplayer.MediaPlayerWaiter;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/MediaWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/MediaWaiter.java
similarity index 86%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/MediaWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/MediaWaiter.java
index 2876301c..909165de 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/MediaWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/MediaWaiter.java
@@ -17,17 +17,17 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.media;
-
-import me.lib720.caprica.vlcj.media.Media;
-import me.lib720.caprica.vlcj.media.MediaEventAdapter;
-import me.lib720.caprica.vlcj.media.MediaEventListener;
-import me.lib720.caprica.vlcj.media.MediaParsedStatus;
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.media.Meta;
-import me.lib720.caprica.vlcj.media.Picture;
-import me.lib720.caprica.vlcj.player.base.State;
-import me.lib720.caprica.vlcj.waiter.Waiter;
+package uk.co.caprica.vlcj.waiter.media;
+
+import uk.co.caprica.vlcj.media.Media;
+import uk.co.caprica.vlcj.media.MediaEventAdapter;
+import uk.co.caprica.vlcj.media.MediaEventListener;
+import uk.co.caprica.vlcj.media.MediaParsedStatus;
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.media.Meta;
+import uk.co.caprica.vlcj.media.Picture;
+import uk.co.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.waiter.Waiter;
/**
* Base implementation for a conditional waiter for media events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ParsedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ParsedWaiter.java
similarity index 89%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ParsedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ParsedWaiter.java
index a1efd850..3cf4af2d 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ParsedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ParsedWaiter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.media;
+package uk.co.caprica.vlcj.waiter.media;
-import me.lib720.caprica.vlcj.media.Media;
-import me.lib720.caprica.vlcj.media.MediaParsedStatus;
+import uk.co.caprica.vlcj.media.Media;
+import uk.co.caprica.vlcj.media.MediaParsedStatus;
/**
* Implementation of a condition that waits for the media player to report that media has been parsed successfully.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java
similarity index 90%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java
index 2a04f2ae..6bfc002c 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/ThumbnailGeneratedWaiter.java
@@ -17,10 +17,10 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.media;
+package uk.co.caprica.vlcj.waiter.media;
-import me.lib720.caprica.vlcj.media.Media;
-import me.lib720.caprica.vlcj.media.Picture;
+import uk.co.caprica.vlcj.media.Media;
+import uk.co.caprica.vlcj.media.Picture;
/**
* Implementation of a condition that waits for the media player to report that a thumbnail picture has been generated
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/package-info.java
similarity index 74%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/package-info.java
index 9070b96f..2c145958 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/media/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/media/package-info.java
@@ -2,4 +2,4 @@
* Default implementations for commonly needed media conditional waiters used with the synchronous programming
* framework.
*/
-package me.lib720.caprica.vlcj.waiter.media;
+package uk.co.caprica.vlcj.waiter.media;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java
index 99ab5e90..cd5a829e 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/LengthChangedWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that the media length has changed.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java
similarity index 92%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java
index dac0da6e..664fffb3 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/MediaPlayerWaiter.java
@@ -17,14 +17,14 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
-
-import me.lib720.caprica.vlcj.media.MediaRef;
-import me.lib720.caprica.vlcj.media.TrackType;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventAdapter;
-import me.lib720.caprica.vlcj.player.base.MediaPlayerEventListener;
-import me.lib720.caprica.vlcj.waiter.Waiter;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
+
+import uk.co.caprica.vlcj.media.MediaRef;
+import uk.co.caprica.vlcj.media.TrackType;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter;
+import uk.co.caprica.vlcj.player.base.MediaPlayerEventListener;
+import uk.co.caprica.vlcj.waiter.Waiter;
/**
* Base implementation for a conditional waiter for media player events.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java
index 0c4de89c..3523e3f3 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PausedWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it is paused.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java
index 616d59b2..dfd8e47f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PlayingWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it is playing.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java
index 348f4678..fce9e3d2 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/PositionReachedWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it has reached/passed a particular
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java
index b258084f..5953c990 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/ReadyWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it is "ready".
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java
index 3dfd4ec6..4c03a654 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/SnapshotTakenWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it has finished taking a snapshot.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java
similarity index 93%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java
index 1a96f47d..876593c9 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/TimeReachedWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that it has reached/passed a particular point
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java
similarity index 91%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java
index 3dc7e161..b865418f 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/VideoOutputCreatedWaiter.java
@@ -17,9 +17,9 @@
* Copyright 2009-2019 Caprica Software Limited.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
/**
* Implementation of a condition that waits for the media player to report that a video output has been created.
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/package-info.java
similarity index 74%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/package-info.java
index e27400c7..5d8ae834 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/mediaplayer/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/mediaplayer/package-info.java
@@ -2,4 +2,4 @@
* Default implementations for commonly needed media media player conditional waiters used with the synchronous
* programming framework.
*/
-package me.lib720.caprica.vlcj.waiter.mediaplayer;
+package uk.co.caprica.vlcj.waiter.mediaplayer;
diff --git a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/package-info.java b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/package-info.java
similarity index 89%
rename from lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/package-info.java
rename to lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/package-info.java
index 89b7cf7b..5c09af5b 100644
--- a/lib-vlcj/src/main/java/me/lib720/caprica/vlcj/waiter/package-info.java
+++ b/lib-vlcj/src/main/java/uk/co/caprica/vlcj/waiter/package-info.java
@@ -7,4 +7,4 @@
* Most applications are not expected to use this synchronous approach, but there are some use-cases where it can be
* convenient.
*/
-package me.lib720.caprica.vlcj.waiter;
+package uk.co.caprica.vlcj.waiter;
diff --git a/lib-vlcj/src/main/resources/META-INF/services/me.lib720.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider b/lib-vlcj/src/main/resources/META-INF/services/me.lib720.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
deleted file mode 100644
index c1a9a159..00000000
--- a/lib-vlcj/src/main/resources/META-INF/services/me.lib720.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
+++ /dev/null
@@ -1,8 +0,0 @@
-me.lib720.caprica.vlcj.factory.discovery.provider.CustomDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.ConfigurationFileDiscoveryDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.JnaLibraryPathDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.LinuxWellKnownDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.OsxWellKnownDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.SystemPathDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.UserDirDirectoryProvider
-me.lib720.caprica.vlcj.factory.discovery.provider.WindowsInstallDirectoryProvider
\ No newline at end of file
diff --git a/lib-vlcj/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider b/lib-vlcj/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
new file mode 100644
index 00000000..6daac33c
--- /dev/null
+++ b/lib-vlcj/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
@@ -0,0 +1,7 @@
+uk.co.caprica.vlcj.factory.discovery.provider.ConfigurationFileDiscoveryDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.JnaLibraryPathDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.LinuxWellKnownDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.OsxWellKnownDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.SystemPathDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.UserDirDirectoryProvider
+uk.co.caprica.vlcj.factory.discovery.provider.WindowsInstallDirectoryProvider
\ No newline at end of file
diff --git a/src/main/java/me/srrapero720/watermedia/OperativeSystem.java b/src/main/java/me/srrapero720/watermedia/OperativeSystem.java
index 0e980c6b..3497e611 100644
--- a/src/main/java/me/srrapero720/watermedia/OperativeSystem.java
+++ b/src/main/java/me/srrapero720/watermedia/OperativeSystem.java
@@ -1,6 +1,7 @@
package me.srrapero720.watermedia;
import com.sun.jna.Platform;
+import me.srrapero720.watermedia.runtime.UnsupportedArchitechtureException;
import static me.srrapero720.watermedia.WaterMedia.IT;
import static me.srrapero720.watermedia.WaterMedia.LOGGER;
@@ -60,7 +61,7 @@ private static OperativeSystem getOs() {
}
return DUMMY;
} else {
- throw new IllegalStateException("32 BITS IS NOT SUPPORTED");
+ throw new UnsupportedArchitechtureException();
}
}
}
\ No newline at end of file
diff --git a/src/main/java/me/srrapero720/watermedia/api/config/support/CustomDirectoryProvider.java b/src/main/java/me/srrapero720/watermedia/api/config/support/CustomDirectoryProvider.java
new file mode 100644
index 00000000..626e1e83
--- /dev/null
+++ b/src/main/java/me/srrapero720/watermedia/api/config/support/CustomDirectoryProvider.java
@@ -0,0 +1,21 @@
+package me.srrapero720.watermedia.api.config.support;
+
+import me.srrapero720.watermedia.WaterMedia;
+import uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider;
+
+public class CustomDirectoryProvider implements DiscoveryDirectoryProvider {
+ @Override
+ public int priority() {
+ return 5;
+ }
+
+ @Override
+ public boolean supported() {
+ return true;
+ }
+
+ @Override
+ public String[] directories() {
+ return new String[] {WaterMedia.getLoader().tempDir().resolve("videolan").toAbsolutePath().toString()};
+ }
+}
diff --git a/src/main/java/me/srrapero720/watermedia/api/player/PlayerAPI.java b/src/main/java/me/srrapero720/watermedia/api/player/PlayerAPI.java
index ad7cca31..348c8c59 100644
--- a/src/main/java/me/srrapero720/watermedia/api/player/PlayerAPI.java
+++ b/src/main/java/me/srrapero720/watermedia/api/player/PlayerAPI.java
@@ -1,8 +1,6 @@
package me.srrapero720.watermedia.api.player;
-import me.lib720.caprica.vlcj.VideoLan4J;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.factory.discovery.NativeDiscovery;
+import com.sun.jna.Platform;
import me.srrapero720.watermedia.OperativeSystem;
import me.srrapero720.watermedia.WaterMedia;
import me.srrapero720.watermedia.api.WaterMediaAPI;
@@ -15,6 +13,8 @@
import org.apache.commons.lang3.ArrayUtils;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.discovery.NativeDiscovery;
import java.io.File;
import java.io.IOException;
@@ -165,7 +165,7 @@ public void start(ILoader bootCore) throws Exception {
}
// VLCJ INIT
- VideoLan4J.init(dir.toAbsolutePath());
+// VideoLan4J.init(dir.toAbsolutePath()); //
// VLC INIT, this need to be soft-crashed because api and game can still work without VLC
try {
diff --git a/src/main/java/me/srrapero720/watermedia/api/player/SyncBasePlayer.java b/src/main/java/me/srrapero720/watermedia/api/player/SyncBasePlayer.java
index 213639c6..0d1aad3a 100644
--- a/src/main/java/me/srrapero720/watermedia/api/player/SyncBasePlayer.java
+++ b/src/main/java/me/srrapero720/watermedia/api/player/SyncBasePlayer.java
@@ -1,21 +1,21 @@
package me.srrapero720.watermedia.api.player;
-import me.lib720.caprica.vlcj.binding.RuntimeUtil;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.media.InfoApi;
-import me.lib720.caprica.vlcj.media.MediaType;
-import me.lib720.caprica.vlcj.player.base.EmbededMediaPlayerEventListener;
-import me.lib720.caprica.vlcj.player.base.MediaPlayer;
-import me.lib720.caprica.vlcj.player.base.State;
-import me.lib720.caprica.vlcj.player.component.CallbackMediaPlayerComponent;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.SimpleBufferFormatCallback;
+import com.sun.jna.Platform;
import me.srrapero720.watermedia.api.url.UrlAPI;
import me.srrapero720.watermedia.api.url.fixers.URLFixer;
import me.srrapero720.watermedia.core.annotations.Experimental;
import me.srrapero720.watermedia.core.tools.ThreadTool;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.media.InfoApi;
+import uk.co.caprica.vlcj.media.MediaType;
+import uk.co.caprica.vlcj.player.base.EmbededMediaPlayerEventListener;
+import uk.co.caprica.vlcj.player.base.MediaPlayer;
+import uk.co.caprica.vlcj.player.base.State;
+import uk.co.caprica.vlcj.player.component.CallbackMediaPlayerComponent;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.SimpleBufferFormatCallback;
import java.net.URL;
@@ -100,6 +100,7 @@ public void startPaused(CharSequence url, String[] vlcArgs) {
});
}
+ @Deprecated
public State getRawPlayerState() {
if (raw == null) return State.ERROR;
return raw.mediaPlayer().status().state();
@@ -271,7 +272,7 @@ public void setMuteMode(boolean mode) {
*/
public long getDuration() {
if (raw == null) return 0L;
- if (!isValid() || (RuntimeUtil.isNix() && getRawPlayerState().equals(State.STOPPED))) return 0L;
+ if (!isValid() || (Platform.isLinux() && getRawPlayerState().equals(State.STOPPED))) return 0L;
return raw.mediaPlayer().status().length();
}
diff --git a/src/main/java/me/srrapero720/watermedia/api/player/SyncMusicPlayer.java b/src/main/java/me/srrapero720/watermedia/api/player/SyncMusicPlayer.java
index 1bba768d..00749aeb 100644
--- a/src/main/java/me/srrapero720/watermedia/api/player/SyncMusicPlayer.java
+++ b/src/main/java/me/srrapero720/watermedia/api/player/SyncMusicPlayer.java
@@ -1,6 +1,6 @@
package me.srrapero720.watermedia.api.player;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
/**
* Player variant with NO VIDEO
diff --git a/src/main/java/me/srrapero720/watermedia/api/player/SyncVideoPlayer.java b/src/main/java/me/srrapero720/watermedia/api/player/SyncVideoPlayer.java
index 5f1ea7af..55e9fcfd 100644
--- a/src/main/java/me/srrapero720/watermedia/api/player/SyncVideoPlayer.java
+++ b/src/main/java/me/srrapero720/watermedia/api/player/SyncVideoPlayer.java
@@ -1,11 +1,11 @@
package me.srrapero720.watermedia.api.player;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
import me.srrapero720.watermedia.api.rendering.RenderAPI;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.lwjgl.opengl.GL11;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
import java.awt.*;
import java.nio.ByteBuffer;
diff --git a/src/main/java/me/srrapero720/watermedia/api/player/vlc/VideoPlayer.java b/src/main/java/me/srrapero720/watermedia/api/player/vlc/VideoPlayer.java
index 425a95cd..291831df 100644
--- a/src/main/java/me/srrapero720/watermedia/api/player/vlc/VideoPlayer.java
+++ b/src/main/java/me/srrapero720/watermedia/api/player/vlc/VideoPlayer.java
@@ -1,7 +1,5 @@
package me.srrapero720.watermedia.api.player.vlc;
-import me.lib720.caprica.vlcj.factory.MediaPlayerFactory;
-import me.lib720.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
import me.srrapero720.watermedia.api.player.PlayerAPI;
import me.srrapero720.watermedia.api.player.SyncBasePlayer;
import me.srrapero720.watermedia.api.rendering.RenderAPI;
@@ -12,6 +10,8 @@
import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL21;
+import uk.co.caprica.vlcj.factory.MediaPlayerFactory;
+import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat;
import java.awt.*;
import java.nio.Buffer;
diff --git a/src/main/java/me/srrapero720/watermedia/runtime/UnsupportedArchitechtureException.java b/src/main/java/me/srrapero720/watermedia/runtime/UnsupportedArchitechtureException.java
new file mode 100644
index 00000000..6d1e260d
--- /dev/null
+++ b/src/main/java/me/srrapero720/watermedia/runtime/UnsupportedArchitechtureException.java
@@ -0,0 +1,7 @@
+package me.srrapero720.watermedia.runtime;
+
+public class UnsupportedArchitechtureException extends UnsupportedOperationException {
+ public UnsupportedArchitechtureException() {
+ super("32 bits are not supported");
+ }
+}
diff --git a/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider b/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
new file mode 100644
index 00000000..6ee90850
--- /dev/null
+++ b/src/main/resources/META-INF/services/uk.co.caprica.vlcj.factory.discovery.provider.DiscoveryDirectoryProvider
@@ -0,0 +1 @@
+me.srrapero720.watermedia.api.config.support.CustomDirectoryProvider
\ No newline at end of file