jint res = 0;
- res = libvlc_audio_get_track( input, exception );
+ res = libvlc_audio_get_track( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
}
INIT_FUNCTION;
GET_INPUT_THREAD;
- libvlc_audio_set_track( input, value, exception );
+ libvlc_audio_set_track( input, value, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
JNIEXPORT jint JNICALL Java_org_videolan_jvlc_Audio__1getChannel (JNIEnv *env, jobject _this)
{
INIT_FUNCTION;
- int res = libvlc_audio_get_channel( ( libvlc_instance_t * ) instance, exception);
+ int res = libvlc_audio_get_channel( ( libvlc_instance_t * ) instance, &exception);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
}
{
INIT_FUNCTION;
- libvlc_audio_set_channel( (libvlc_instance_t *) instance, channel, exception);
+ libvlc_audio_set_channel( (libvlc_instance_t *) instance, channel, &exception);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
INIT_FUNCTION;
jboolean res;
- res = (jboolean) libvlc_audio_get_mute( ( libvlc_instance_t * ) instance, exception );
+ res = (jboolean) libvlc_audio_get_mute( ( libvlc_instance_t * ) instance, &exception );
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
{
INIT_FUNCTION;
- libvlc_audio_set_mute( ( libvlc_instance_t * ) instance, value, exception );
+ libvlc_audio_set_mute( ( libvlc_instance_t * ) instance, value, &exception );
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Audio__1toggleMute (JNIEnv *env, jobject _this)
{
INIT_FUNCTION;
- libvlc_audio_get_mute( ( libvlc_instance_t * ) instance, exception );
+ libvlc_audio_get_mute( ( libvlc_instance_t * ) instance, &exception );
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
JNIEXPORT jint JNICALL Java_org_videolan_jvlc_Audio__1getVolume (JNIEnv *env, jobject _this)
INIT_FUNCTION;
jint res = 0;
- res = libvlc_audio_get_volume( ( libvlc_instance_t * ) instance, exception );
+ res = libvlc_audio_get_volume( ( libvlc_instance_t * ) instance, &exception );
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
}
{
INIT_FUNCTION;
- libvlc_audio_set_volume( ( libvlc_instance_t * ) instance, volume, exception );
+ libvlc_audio_set_volume( ( libvlc_instance_t * ) instance, volume, &exception );
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
libvlc_VolumeChanged,
volumeChangedCallback,
NULL,
- exception );
- CHECK_EXCEPTION_FREE ;
+ &exception );
+ CHECK_EXCEPTION ;
}
void volumeChangedCallback( struct libvlc_instance_t *p_instance, libvlc_event_t *event, void *user_data )
GET_INPUT_THREAD ;
- res = libvlc_media_instance_get_length( input, exception );
+ res = libvlc_media_instance_get_length( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_media_instance_get_position( input, exception );
+ res = libvlc_media_instance_get_position( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_media_instance_get_time( input, exception );
+ res = libvlc_media_instance_get_time( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_media_instance_get_fps( input, exception );
+ res = libvlc_media_instance_get_fps( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- libvlc_media_instance_set_time( input, time, exception );
+ libvlc_media_instance_set_time( input, time, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
GET_INPUT_THREAD ;
- libvlc_media_instance_set_position( input, position, exception );
+ libvlc_media_instance_set_position( input, position, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
JNIEXPORT jboolean JNICALL Java_org_videolan_jvlc_Input__1isPlaying (JNIEnv *env, jobject _this)
GET_INPUT_THREAD ;
- res = libvlc_media_instance_will_play( input, exception );
+ res = libvlc_media_instance_will_play( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_media_instance_has_vout( input, exception );
+ res = libvlc_media_instance_has_vout( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
ppsz_options[ i+1 ] =\r
env->GetStringUTFChars( ( jstring ) env->GetObjectArrayElement( options, i ), 0 );\r
}\r
- res = libvlc_playlist_add_extended( ( libvlc_instance_t * ) instance, psz_uri, psz_name, i_options, ppsz_options, exception );\r
+ res = libvlc_playlist_add_extended( ( libvlc_instance_t * ) instance, psz_uri, psz_name, i_options, ppsz_options, &exception );\r
\r
- CHECK_EXCEPTION_FREE;\r
+ CHECK_EXCEPTION;\r
\r
} else {\r
- res = libvlc_playlist_add( ( libvlc_instance_t * ) instance, psz_uri, psz_name, exception );\r
+ res = libvlc_playlist_add( ( libvlc_instance_t * ) instance, psz_uri, psz_name, &exception );\r
\r
- CHECK_EXCEPTION_FREE;\r
+ CHECK_EXCEPTION;\r
}\r
\r
if (psz_uri != NULL) {\r
}\r
}\r
\r
- libvlc_playlist_play( ( libvlc_instance_t * ) instance, id, i_options, ( char ** ) ppsz_options, exception );\r
+ libvlc_playlist_play( ( libvlc_instance_t * ) instance, id, i_options, ( char ** ) ppsz_options, &exception );\r
\r
CHECK_EXCEPTION;\r
\r
- while (! libvlc_playlist_isplaying( (libvlc_instance_t*) instance, exception ) )\r
+ while (! libvlc_playlist_isplaying( (libvlc_instance_t*) instance, &exception ) )\r
{\r
usleep(100);\r
}\r
\r
- CHECK_EXCEPTION_FREE;\r
+ CHECK_EXCEPTION;\r
}\r
\r
\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_pause( ( libvlc_instance_t* ) instance, exception );\r
+ libvlc_playlist_pause( ( libvlc_instance_t* ) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1stop (JNIEnv *env, jobject _this)\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_stop( ( libvlc_instance_t* ) instance, exception );\r
+ libvlc_playlist_stop( ( libvlc_instance_t* ) instance, &exception );\r
\r
- while ( libvlc_playlist_isplaying( (libvlc_instance_t*) instance, exception ) )\r
+ while ( libvlc_playlist_isplaying( (libvlc_instance_t*) instance, &exception ) )\r
{\r
usleep(100);\r
}\r
\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1next (JNIEnv *env, jobject _this)\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_next( ( libvlc_instance_t* ) instance, exception );\r
+ libvlc_playlist_next( ( libvlc_instance_t* ) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1prev (JNIEnv *env, jobject _this)\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_prev( (libvlc_instance_t*) instance, exception );\r
+ libvlc_playlist_prev( (libvlc_instance_t*) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1clear (JNIEnv *env, jobject _this)\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_clear( (libvlc_instance_t*) instance, exception );\r
+ libvlc_playlist_clear( (libvlc_instance_t*) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1deleteItem (JNIEnv *env, jobject _this, jint itemID)\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_delete_item( ( libvlc_instance_t * ) instance, itemID, exception );\r
+ libvlc_playlist_delete_item( ( libvlc_instance_t * ) instance, itemID, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
}\r
\r
\r
INIT_FUNCTION ;\r
int res = 0;\r
\r
- res = libvlc_playlist_items_count( (libvlc_instance_t*) instance, exception );\r
+ res = libvlc_playlist_items_count( (libvlc_instance_t*) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
\r
return res;\r
\r
INIT_FUNCTION ;\r
int res = 0;\r
\r
- res = libvlc_playlist_isplaying( (libvlc_instance_t*) instance, exception );\r
+ res = libvlc_playlist_isplaying( (libvlc_instance_t*) instance, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
\r
return res;\r
}\r
{\r
INIT_FUNCTION ;\r
\r
- libvlc_playlist_loop( (libvlc_instance_t*) instance, loop, exception );\r
+ libvlc_playlist_loop( (libvlc_instance_t*) instance, loop, &exception );\r
\r
- CHECK_EXCEPTION_FREE ;\r
+ CHECK_EXCEPTION ;\r
\r
} \r
void handle_vlc_exception( JNIEnv*, libvlc_exception_t* );
jlong getInstance ( JNIEnv* , jobject );
-#define CHECK_EXCEPTION_FREE \
- if ( libvlc_exception_raised( exception )) \
- { \
- handle_vlc_exception( env, exception ); \
- } \
- free( exception );
-
#define CHECK_EXCEPTION \
- if ( libvlc_exception_raised( exception )) \
+ if ( libvlc_exception_raised( &exception )) \
{ \
- handle_vlc_exception( env, exception ); \
+ handle_vlc_exception( env, &exception ); \
}
#define INIT_FUNCTION \
long instance; \
- libvlc_exception_t *exception = ( libvlc_exception_t * ) malloc( sizeof( libvlc_exception_t )); \
- libvlc_exception_init( exception ); \
+ libvlc_exception_t exception; \
+ libvlc_exception_init( &exception ); \
instance = getInstance( env, _this );
#define GET_INPUT_THREAD \
libvlc_media_instance_t *input; \
- input = libvlc_playlist_get_media_instance( ( libvlc_instance_t *) instance, exception ); \
+ input = libvlc_playlist_get_media_instance( ( libvlc_instance_t *) instance, &exception ); \
CHECK_EXCEPTION ;
#define ATTACH_JVM \
GET_INPUT_THREAD ;
- libvlc_toggle_fullscreen( input, exception );
+ libvlc_toggle_fullscreen( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
}
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Video__1setFullscreen (JNIEnv *env, jobject _this, jboolean value)
GET_INPUT_THREAD ;
- libvlc_set_fullscreen( input, value, exception );
+ libvlc_set_fullscreen( input, value, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
}
JNIEXPORT jboolean JNICALL Java_org_videolan_jvlc_Video__1getFullscreen (JNIEnv *env, jobject _this)
GET_INPUT_THREAD ;
- res = libvlc_get_fullscreen( input, exception );
+ res = libvlc_get_fullscreen( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_video_get_height( input, exception );
+ res = libvlc_video_get_height( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- res = libvlc_video_get_width( input, exception );
+ res = libvlc_video_get_width( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
return res;
}
GET_INPUT_THREAD ;
- libvlc_video_take_snapshot( input, (char *) psz_filepath, exception );
+ libvlc_video_take_snapshot( input, (char *) psz_filepath, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
if (psz_filepath != NULL) {
env->ReleaseStringUTFChars( filepath, psz_filepath );
GET_INPUT_THREAD ;
- libvlc_video_destroy( input, exception );
+ libvlc_video_destroy( input, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE;
+ CHECK_EXCEPTION;
}
JNIEXPORT void JNICALL Java_org_videolan_jvlc_Video__1reparent (JNIEnv *env, jobject _this, jobject canvas)
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
drawable = reinterpret_cast<int>(dsi_win->hwnd);
- libvlc_video_set_parent((libvlc_instance_t *) instance, drawable, exception );
+ libvlc_video_set_parent((libvlc_instance_t *) instance, drawable, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
#else // UNIX
/* Get the platform-specific drawing info */
/* and reparent */
drawable = dsi_x11->drawable;
- libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, exception );
+ libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, &exception );
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
XFreeGC(dsi_x11->display, gc);
dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
drawable = reinterpret_cast<int>(dsi_win->hwnd);
- libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, exception );
+ libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, &exception );
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
#else // UNIX
/* Get the platform-specific drawing info */
/* and reparent */
drawable = dsi_x11->drawable;
- libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, exception );
+ libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, &exception );
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
XFreeGC(dsi_x11->display, gc);
GET_INPUT_THREAD ;
- libvlc_video_resize( input, width, height, exception );
+ libvlc_video_resize( input, width, height, &exception );
libvlc_media_instance_release(input);
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
}
}
libvlc_vlm_add_broadcast( (libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_inputmrl, (char*)psz_outputmrl ,
- i_options, (char**)ppsz_options, enable, loop, exception );
+ i_options, (char**)ppsz_options, enable, loop, &exception );
- CHECK_EXCEPTION_FREE ;
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
INIT_FUNCTION ;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_del_media( (libvlc_instance_t *) instance, (char*)psz_name, exception);
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_del_media( (libvlc_instance_t *) instance, (char*)psz_name, &exception);
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
INIT_FUNCTION ;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_set_enabled( (libvlc_instance_t *) instance, (char*)psz_name, newStatus, exception);
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_set_enabled( (libvlc_instance_t *) instance, (char*)psz_name, newStatus, &exception);
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
const char* psz_name = env->GetStringUTFChars( name, 0 );
const char* psz_mrl = env->GetStringUTFChars( mrl, 0 );
- libvlc_vlm_set_output((libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_mrl, exception);
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_set_output((libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_mrl, &exception);
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
const char* psz_name = env->GetStringUTFChars( name, 0 );
const char* psz_mrl = env->GetStringUTFChars( mrl, 0 );
- libvlc_vlm_set_input((libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_mrl, exception);
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_set_input((libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_mrl, &exception);
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
INIT_FUNCTION;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_set_loop((libvlc_instance_t *) instance, (char*)psz_name, newStatus, exception);
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_set_loop((libvlc_instance_t *) instance, (char*)psz_name, newStatus, &exception);
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
}
libvlc_vlm_change_media( (libvlc_instance_t *) instance, (char*)psz_name, (char*)psz_inputmrl, (char*)psz_outputmrl ,
- i_options, (char**)ppsz_options, enablenewbroadcast, broadcast, exception );
- CHECK_EXCEPTION_FREE ;
+ i_options, (char**)ppsz_options, enablenewbroadcast, broadcast, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
INIT_FUNCTION;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_play_media( (libvlc_instance_t *) instance, (char*)psz_name, exception );
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_play_media( (libvlc_instance_t *) instance, (char*)psz_name, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_stop_media( (libvlc_instance_t *) instance, (char*)psz_name, exception );
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_stop_media( (libvlc_instance_t *) instance, (char*)psz_name, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
INIT_FUNCTION;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_pause_media( (libvlc_instance_t *) instance, (char*)psz_name, exception );
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_pause_media( (libvlc_instance_t *) instance, (char*)psz_name, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
INIT_FUNCTION;
const char* psz_name = env->GetStringUTFChars( name, 0 );
- libvlc_vlm_seek_media( (libvlc_instance_t *) instance, (char*)psz_name, (float)percentage, exception );
- CHECK_EXCEPTION_FREE ;
+ libvlc_vlm_seek_media( (libvlc_instance_t *) instance, (char*)psz_name, (float)percentage, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
char *psz_response;
jstring js_response;
- psz_response = libvlc_vlm_show_media( (libvlc_instance_t *) instance, (char*)psz_name, exception );
- CHECK_EXCEPTION_FREE ;
+ psz_response = libvlc_vlm_show_media( (libvlc_instance_t *) instance, (char*)psz_name, &exception );
+ CHECK_EXCEPTION ;
if (psz_name != NULL) {
env->ReleaseStringUTFChars( name, psz_name );
const char* psz_name = env->GetStringUTFChars( name, 0 ); \
returnType response; \
\
- response = libvlc_vlm_get_media_ ## attr( (libvlc_instance_t *) instance, (char*)psz_name, (int)index, exception ); \
- CHECK_EXCEPTION_FREE ; \
+ response = libvlc_vlm_get_media_ ## attr( (libvlc_instance_t *) instance, (char*)psz_name, (int)index, &exception ); \
+ CHECK_EXCEPTION ; \
\
if (psz_name != NULL) { \
env->ReleaseStringUTFChars( name, psz_name ); \