struct libvlc_instance_t
{
- vlc_t *p_vlc;
+ libvlc_int_t *p_libvlc_int;
playlist_t *p_playlist;
vlm_t *p_vlm;
int i_vlc_id;
*****************************************************************************/
/*****************************************************************************
- * libvlc_t (global variable)
+ * libvlc_global_data_t (global variable)
*****************************************************************************
* This structure has an unique instance, statically allocated in main and
- * never accessed from the outside. It store once-initialized data such as
+ * never accessed from the outside. It stores once-initialized data such as
* the CPU capabilities or the global lock.
*****************************************************************************/
-struct libvlc_t
+struct libvlc_global_data_t
{
VLC_COMMON_MEMBERS
module_bank_t * p_module_bank; ///< The module bank
- vlc_bool_t b_stats; ///< Should we collect stats
+ vlc_bool_t b_stats; ///< Should we collect stats
/* Timers handling */
- vlc_mutex_t timer_lock; ///< Lock to protect timers
- int i_timers; ///< Number of timers
- counter_t **pp_timers; ///< Array of all timers
+ vlc_mutex_t timer_lock; ///< Lock to protect timers
+ int i_timers; ///< Number of timers
+ counter_t **pp_timers; ///< Array of all timers
- intf_thread_t *p_probe; ///< Devices prober
+ intf_thread_t *p_probe; ///< Devices prober
/* Arch-specific variables */
#if !defined( WIN32 )
};
/*****************************************************************************
- * vlc_t, p_vlc
+ * libvlc_internal_instance_t
*****************************************************************************
- * This structure is a LibVLC instance.
+ * This structure is a LibVLC instance, for use by libvlc core and plugins
*****************************************************************************/
-struct vlc_t
+struct libvlc_int_t
{
VLC_COMMON_MEMBERS
*****************************************************************************/
/* Internal types */
-typedef struct libvlc_t libvlc_t;
-typedef struct vlc_t vlc_t;
+typedef struct libvlc_global_data_t libvlc_global_data_t;
+typedef struct libvlc_int_t libvlc_int_t;
typedef struct variable_t variable_t;
typedef struct date_t date_t;
typedef struct dict_entry_t dict_entry_t;
variable_t * p_vars; \
\
/* Stuff related to the libvlc structure */ \
- libvlc_t * p_libvlc; /**< root of all evil */ \
- vlc_t * p_vlc; /**< (root of all evil) - 1 */ \
+ libvlc_global_data_t *p_libvlc_global; /**< root of all evil */ \
+ libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \
\
volatile int i_refcount; /**< usage count */ \
vlc_object_t * p_parent; /**< our parent */ \
/* Object types */
#define VLC_OBJECT_ROOT (-1)
-#define VLC_OBJECT_VLC (-2)
+#define VLC_OBJECT_LIBVLC (-2)
#define VLC_OBJECT_MODULE (-3)
#define VLC_OBJECT_INTF (-4)
#define VLC_OBJECT_PLAYLIST (-5)
VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
-VLC_EXPORT( vlc_t *, vlc_current_object, ( int ) );
+VLC_EXPORT( libvlc_int_t *, vlc_current_object, ( int ) );
/*}@*/
void *__stats_CounterGet_deprecated;
input_thread_t * (*__input_CreateThread2_inner) (vlc_object_t *, input_item_t *, char *);
void *stats_HandlerDestroy_deprecated;
- vlc_t * (*vlc_current_object_inner) (int);
+ libvlc_int_t * (*vlc_current_object_inner) (int);
void (*__var_OptionParse_inner) (vlc_object_t *, const char *);
void *__stats_TimerDumpAll_deprecated;
void (*__stats_TimerDump_inner) (vlc_object_t*, unsigned int);
void (*playlist_NodeDump_inner) (playlist_t *p_playlist, playlist_item_t *p_item, int i_level);
void *__intf_UserOkayCancel_deprecated;
int (*__intf_UserStringInput_inner) (vlc_object_t*, const char*, const char*, char **);
- void (*playlist_NodesCreateForSD_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **);
+ void *playlist_NodesCreateForSD_deprecated;
vlc_bool_t (*input_AddSubtitles_inner) (input_thread_t *, char *, vlc_bool_t);
counter_t * (*__stats_CounterCreate_inner) (vlc_object_t*, int, int);
void *stats_TimerClean_deprecated;
int (*net_SetDSCP_inner) (int fd, uint8_t dscp);
void (*vout_EnableFilter_inner) (vout_thread_t *, char *,vlc_bool_t , vlc_bool_t);
void (*aout_EnableFilter_inner) (vlc_object_t *, const char *, vlc_bool_t);
+ void (*playlist_NodesPairCreate_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **, vlc_bool_t);
};
# if defined (__PLUGIN__)
# define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
# define playlist_DeleteFromItemId (p_symbols)->playlist_DeleteFromItemId_inner
# define playlist_NodeDump (p_symbols)->playlist_NodeDump_inner
# define __intf_UserStringInput (p_symbols)->__intf_UserStringInput_inner
-# define playlist_NodesCreateForSD (p_symbols)->playlist_NodesCreateForSD_inner
# define input_AddSubtitles (p_symbols)->input_AddSubtitles_inner
# define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
# define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
# define net_SetDSCP (p_symbols)->net_SetDSCP_inner
# define vout_EnableFilter (p_symbols)->vout_EnableFilter_inner
# define aout_EnableFilter (p_symbols)->aout_EnableFilter_inner
+# define playlist_NodesPairCreate (p_symbols)->playlist_NodesPairCreate_inner
# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
/******************************************************************
* STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
((p_symbols)->playlist_DeleteFromItemId_inner) = playlist_DeleteFromItemId; \
((p_symbols)->playlist_NodeDump_inner) = playlist_NodeDump; \
((p_symbols)->__intf_UserStringInput_inner) = __intf_UserStringInput; \
- ((p_symbols)->playlist_NodesCreateForSD_inner) = playlist_NodesCreateForSD; \
((p_symbols)->input_AddSubtitles_inner) = input_AddSubtitles; \
((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
((p_symbols)->net_SetDSCP_inner) = net_SetDSCP; \
((p_symbols)->vout_EnableFilter_inner) = vout_EnableFilter; \
((p_symbols)->aout_EnableFilter_inner) = aout_EnableFilter; \
+ ((p_symbols)->playlist_NodesPairCreate_inner) = playlist_NodesPairCreate; \
(p_symbols)->net_ConvertIPv4_deprecated = NULL; \
(p_symbols)->__playlist_ItemNew_deprecated = NULL; \
(p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
(p_symbols)->playlist_PlaylistAddExt_deprecated = NULL; \
(p_symbols)->playlist_PlaylistAddInput_deprecated = NULL; \
(p_symbols)->__intf_UserOkayCancel_deprecated = NULL; \
+ (p_symbols)->playlist_NodesCreateForSD_deprecated = NULL; \
(p_symbols)->stats_TimerClean_deprecated = NULL; \
(p_symbols)->stats_TimersClean_deprecated = NULL; \
(p_symbols)->__intf_IntfProgressUpdate_deprecated = NULL; \
*/
struct update_t
{
- vlc_t *p_vlc;
+ libvlc_int_t *p_libvlc;
vlc_mutex_t lock;
}
sample.p_sample->GetPointer( &p_data );
- p_access->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+ p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
sample.p_sample->Release();
/* The caller got what he wanted */
#endif
p_block = block_New( p_demux, i_data_size );
- p_demux->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+ p_demux->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
p_block->i_pts = p_block->i_dts = i_pts;
sample.p_sample->Release();
p_ev->b_still = VLC_FALSE;
/* catch all key event */
- var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev );
+ var_AddCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev );
/* main loop */
while( !p_ev->b_die )
pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
vlc_value_t valk;
- struct hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys;
+ struct hotkey *p_hotkeys = p_ev->p_libvlc->p_hotkeys;
int i, i_action = -1;
vlc_mutex_lock( &p_ev->lock );
- var_Get( p_ev->p_vlc, "key-pressed", &valk );
+ var_Get( p_ev->p_libvlc, "key-pressed", &valk );
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
if( p_hotkeys[i].i_key == valk.i_int )
var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );
vlc_object_release( p_vout );
}
- var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev );
+ var_DelCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev );
vlc_mutex_destroy( &p_ev->lock );
{
/* This is incomplete : we should also support the ~cmassiot/
* syntax. */
- asprintf( &psz, "%s/%s", p_access->p_vlc->psz_homedir, psz_name + 2 );
+ asprintf( &psz, "%s/%s", p_access->p_libvlc->psz_homedir, psz_name + 2 );
free( psz_name );
psz_name = psz;
}
p_block->i_buffer = i_buffer;
p_block->p_buffer = p_buffer;
p_block->pf_release = CaptureBlockRelease;
- p_block->p_manager = VLC_OBJECT( p_demux->p_vlc );
+ p_block->p_manager = VLC_OBJECT( p_demux->p_libvlc );
p_block->p_sys->hbmp = hbmp;
return p_block;
p_intf->pf_run = RunIntf;
- var_AddCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
p_intf->p_sys->m_still_time = 0;
p_intf->p_sys->b_infinite_still = 0;
p_intf->p_sys->b_still = 0;
void VCDCloseIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- var_DelCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
/* Destroy structure */
free( p_intf->p_sys );
{
vlc_value_t val;
int i, i_action = -1;
- struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
p_intf->p_sys->b_key_pressed = VLC_FALSE;
/* Find action triggered by hotkey (if any) */
- var_Get( p_intf->p_vlc, "key-pressed", &val );
+ var_Get( p_intf->p_libvlc, "key-pressed", &val );
dbg_print( INPUT_DBG_EVENT, "Key pressed %d", val.i_int );
if( *psz == '\0' )
{
free( psz );
- if( p_access->p_vlc->psz_homedir )
- psz = strdup( p_access->p_vlc->psz_homedir );
+ if( p_access->p_libvlc->psz_homedir )
+ psz = strdup( p_access->p_libvlc->psz_homedir );
}
p_sys->psz_path = psz;
msg_Dbg( p_access, "Record access filter path %s", psz );
/* catch all key event */
- var_AddCallback( p_access->p_vlc, "key-pressed", EventKey, p_access );
+ var_AddCallback( p_access->p_libvlc, "key-pressed", EventKey, p_access );
return VLC_SUCCESS;
}
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys = p_access->p_sys;
- var_DelCallback( p_access->p_vlc, "key-pressed", EventKey, p_access );
+ var_DelCallback( p_access->p_libvlc, "key-pressed", EventKey, p_access );
if( p_sys->f )
{
access_t *p_access = p_data;
access_sys_t *p_sys = p_access->p_sys;
- struct hotkey *p_hotkeys = p_access->p_vlc->p_hotkeys;
+ struct hotkey *p_hotkeys = p_access->p_libvlc->p_hotkeys;
int i_action = -1, i;
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
/* Copy the S/PDIF headers. */
if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
+ p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 );
p_out[4] = p_in[5] & 0x7; /* bsmod */
p_out[6] = (i_frame_size >> 4) & 0xff;
p_out[7] = (i_frame_size << 4) & 0xff;
- p_filter->p_vlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
+ p_filter->p_libvlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 );
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
+ p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 );
p_out[5] = p_in[5] & 0x7; /* bsmod */
p_out[6] = (i_frame_size << 4) & 0xff;
p_out[7] = (i_frame_size >> 4) & 0xff;
}
#endif
}
- p_filter->p_vlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
+ p_filter->p_libvlc->pf_memset( p_out + 8 + i_frame_size * 2, 0,
AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 );
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
}
/* Backup frame */
- p_filter->p_vlc->pf_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
+ p_filter->p_libvlc->pf_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes *
p_filter->p_sys->i_frames, p_in_buf->p_buffer,
p_in_buf->i_nb_bytes );
/* Copy the S/PDIF headers. */
if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_be, 6 );
+ p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 );
p_out[5] = i_ac5_spdif_type;
p_out[6] = (( i_length ) >> 5 ) & 0xFF;
p_out[7] = ( i_length << 3 ) & 0xFF;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_sync_le, 6 );
+ p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 );
p_out[4] = i_ac5_spdif_type;
p_out[6] = ( i_length << 3 ) & 0xFF;
p_out[7] = (( i_length ) >> 5 ) & 0xFF;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out + 8, p_in, i_length );
+ p_filter->p_libvlc->pf_memcpy( p_out + 8, p_in, i_length );
}
if( i_fz > i_length + 8 )
{
- p_filter->p_vlc->pf_memset( p_out + 8 + i_length, 0,
+ p_filter->p_libvlc->pf_memset( p_out + 8 + i_length, 0,
i_fz - i_length - 8 );
}
}
break;
case 1:
- p_filter->p_vlc->pf_memcpy( p_samples, p_left,
+ p_filter->p_libvlc->pf_memcpy( p_samples, p_left,
i_samples * sizeof(mad_fixed_t) );
break;
mad_synth_init( &p_sys->mad_synth );
mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC );
- if( p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+ if( p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU )
p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
else
p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
/* Copy all our samples in p_in */
if( p_filter->p_sys->i_old_wing )
{
- p_aout->p_vlc->pf_memcpy( p_in, p_filter->p_sys->p_buf,
+ p_aout->p_libvlc->pf_memcpy( p_in, p_filter->p_sys->p_buf,
p_filter->p_sys->i_old_wing * 2 *
p_filter->input.i_bytes_per_frame );
}
- p_aout->p_vlc->pf_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 *
+ p_aout->p_libvlc->pf_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 *
i_nb_channels, p_in_buf->p_buffer,
p_in_buf->i_nb_samples *
p_filter->input.i_bytes_per_frame );
return;
}
- p_aout->p_vlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
/* Take care of the previous input sample (if any) */
if( !p_filter->b_continuity )
{
/* For whatever reason the buffer allocator decided to allocate
* a new buffer. Currently, this never happens. */
- p_aout->p_vlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer,
+ p_aout->p_libvlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer,
__MIN(i_out_nb, i_in_nb) * i_sample_bytes );
}
return;
}
- p_aout->p_vlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
for( i_out = i_out_nb ; i_out-- ; )
{
aout_buffer_t * p_old_buffer;
if ( i_available_bytes > 0 )
- p_aout->p_vlc->pf_memcpy( p_out, p_in, i_available_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_available_bytes );
i_nb_bytes -= i_available_bytes;
p_out += i_available_bytes;
else
{
if ( i_nb_bytes > 0 )
- p_aout->p_vlc->pf_memcpy( p_out, p_in, i_nb_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_nb_bytes );
p_input->p_first_byte_to_mix = p_in + i_nb_bytes;
break;
}
/* Choose the linear PCM format (read the comment above about FPU
and float32) */
- if( p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+ if( p_aout->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU )
{
i_vlc_pcm_format = VLC_FOURCC('f','l','3','2');
i_snd_pcm_format = SND_PCM_FORMAT_FLOAT;
aout_FormatPrint( p_aout, "VLC is looking for:", (audio_sample_format_t *)&p_aout->output.output );
/* Persistent device variable */
- if( var_Type( p_aout->p_vlc, "macosx-audio-device" ) == 0 )
+ if( var_Type( p_aout->p_libvlc, "macosx-audio-device" ) == 0 )
{
- var_Create( p_aout->p_vlc, "macosx-audio-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_aout->p_libvlc, "macosx-audio-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
}
/* Build a list of devices */
}
/* If a device is already "preselected", then use this device */
- var_Get( p_aout->p_vlc, "macosx-audio-device", &val );
+ var_Get( p_aout->p_libvlc, "macosx-audio-device", &val );
if( val.i_int > 0 )
{
var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
if( p_sys->i_total_bytes > 0 )
{
i_mData_bytes = __MIN( p_sys->i_total_bytes - p_sys->i_read_bytes, ioData->mBuffers[0].mDataByteSize );
- p_aout->p_vlc->pf_memcpy( ioData->mBuffers[0].mData, &p_sys->p_remainder_buffer[p_sys->i_read_bytes], i_mData_bytes );
+ p_aout->p_libvlc->pf_memcpy( ioData->mBuffers[0].mData, &p_sys->p_remainder_buffer[p_sys->i_read_bytes], i_mData_bytes );
p_sys->i_read_bytes += i_mData_bytes;
current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->output.output.i_rate ) *
( i_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->output.output ) ); // 4 is fl32 specific
{
uint32_t i_second_mData_bytes = __MIN( p_buffer->i_nb_bytes, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
- p_aout->p_vlc->pf_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, p_buffer->p_buffer, i_second_mData_bytes );
+ p_aout->p_libvlc->pf_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, p_buffer->p_buffer, i_second_mData_bytes );
i_mData_bytes += i_second_mData_bytes;
if( i_mData_bytes >= ioData->mBuffers[0].mDataByteSize )
{
p_sys->i_total_bytes = p_buffer->i_nb_bytes - i_second_mData_bytes;
- p_aout->p_vlc->pf_memcpy( p_sys->p_remainder_buffer, &p_buffer->p_buffer[i_second_mData_bytes], p_sys->i_total_bytes );
+ p_aout->p_libvlc->pf_memcpy( p_sys->p_remainder_buffer, &p_buffer->p_buffer[i_second_mData_bytes], p_sys->i_total_bytes );
}
else
{
}
else
{
- p_aout->p_vlc->pf_memset( (uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes, 0, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
+ p_aout->p_libvlc->pf_memset( (uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes, 0, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
i_mData_bytes += ioData->mBuffers[0].mDataByteSize - i_mData_bytes;
}
}
msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_nb_bytes );
/* move data into output data buffer */
- p_aout->p_vlc->pf_memcpy( BUFFER.mData,
+ p_aout->p_libvlc->pf_memcpy( BUFFER.mData,
p_buffer->p_buffer, p_buffer->i_nb_bytes );
aout_BufferFree( p_buffer );
}
else
{
- p_aout->p_vlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize );
+ p_aout->p_libvlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize );
}
#undef BUFFER
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
- var_Set( p_aout->p_vlc, "macosx-audio-device", new_val );
+ var_Set( p_aout->p_libvlc, "macosx-audio-device", new_val );
msg_Dbg( p_aout, "Set Device: %#x", new_val.i_int );
return aout_ChannelsRestart( p_this, psz_variable, old_val, new_val, param );
}
p_sys->i_bits_per_sample );
}
- p_aout->p_vlc->pf_memcpy( p_write_position, p_buffer->p_buffer,
+ p_aout->p_libvlc->pf_memcpy( p_write_position, p_buffer->p_buffer,
l_bytes1 );
aout_BufferFree( p_buffer );
}
p_aout->output.pf_play = Play;
aout_VolumeSoftInit( p_aout );
- i_volume = config_GetInt( p_aout->p_vlc, "volume" );
+ i_volume = config_GetInt( p_aout->p_libvlc, "volume" );
pPlayer->SetVolume( (u32)__MIN( i_volume * 64, 0xFFFF ) );
/* Create thread and wait for its readiness. */
#define i p_sys->nNextBufferIndex
if( p_buffer == NULL )
{
- p_aout->p_vlc->pf_memset( p_sys->ppBuffers[ i ], 0,
+ p_aout->p_libvlc->pf_memset( p_sys->ppBuffers[ i ], 0,
p_sys->nBufferSize );
}
else
p_sys->i_channels, p_sys->pi_chan_table,
p_sys->i_bits_per_sample );
}
- p_aout->p_vlc->pf_memcpy( outputBuffer, p_buffer->p_buffer,
+ p_aout->p_libvlc->pf_memcpy( outputBuffer, p_buffer->p_buffer,
framesPerBuffer * p_sys->i_sample_size );
/* aout_BufferFree may be dangereous here, but then so is
* aout_OutputNextBuffer (calls aout_BufferFree internally).
else
/* Audio output buffer shortage -> stop the fill process and wait */
{
- p_aout->p_vlc->pf_memset( outputBuffer, 0,
+ p_aout->p_libvlc->pf_memset( outputBuffer, 0,
framesPerBuffer * p_sys->i_sample_size );
}
return 0;
if ( p_buffer != NULL )
{
- p_aout->p_vlc->pf_memcpy( p_stream, p_buffer->p_buffer, i_len );
+ p_aout->p_libvlc->pf_memcpy( p_stream, p_buffer->p_buffer, i_len );
aout_BufferFree( p_buffer );
}
else
{
- p_aout->p_vlc->pf_memset( p_stream, 0, i_len );
+ p_aout->p_libvlc->pf_memset( p_stream, 0, i_len );
}
}
p_intf->pf_run = RunIntf;
- var_AddCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
/* we also need to add the callback for "mouse-clicked", but do that later
* when we've found a p_vout */
- var_Create( p_intf->p_vlc, "browse-go-back", VLC_VAR_VOID );
- var_AddCallback( p_intf->p_vlc, "browse-go-back",
+ var_Create( p_intf->p_libvlc, "browse-go-back", VLC_VAR_VOID );
+ var_AddCallback( p_intf->p_libvlc, "browse-go-back",
GoBackCallback, p_intf );
- var_Create( p_intf->p_vlc, "browse-go-forward", VLC_VAR_VOID );
- var_AddCallback( p_intf->p_vlc, "browse-go-forward",
+ var_Create( p_intf->p_libvlc, "browse-go-forward", VLC_VAR_VOID );
+ var_AddCallback( p_intf->p_libvlc, "browse-go-forward",
GoForwardCallback, p_intf );
- var_Create( p_intf->p_vlc, "browse-follow-anchor", VLC_VAR_VOID );
- var_AddCallback( p_intf->p_vlc, "browse-follow-anchor",
+ var_Create( p_intf->p_libvlc, "browse-follow-anchor", VLC_VAR_VOID );
+ var_AddCallback( p_intf->p_libvlc, "browse-follow-anchor",
FollowAnchorCallback, p_intf );
return( 0 );
vlc_object_release( p_vout );
}
- var_DelCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
vlc_object_release( p_intf->p_sys->p_cmml_decoder );
{
vlc_value_t val;
int i, i_action = -1;
- struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
/* Find action triggered by hotkey (if any) */
- var_Get( p_intf->p_vlc, "key-pressed", &val );
+ var_Get( p_intf->p_libvlc, "key-pressed", &val );
/* Acknowledge that we've handled the b_key_pressed event */
p_intf->p_sys->b_key_pressed = VLC_FALSE;
if( p_vout != NULL )
{
/* don't display anchor if main interface can display it */
- p_primary_intf = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_INTF,
+ p_primary_intf = vlc_object_find( p_intf->p_libvlc, VLC_OBJECT_INTF,
FIND_CHILD );
if( p_primary_intf )
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
p_src += i_width;
p_dst += i_dst_stride;
}
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_enc->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+ p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
p_dst += i_width;
p_src += i_src_stride;
}
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
p_src += i_width;
p_dst += i_dst_stride;
}
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
i_line++ )
{
- p_enc->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+ p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
p_dst += i_width;
p_src += i_src_stride;
}
aout_DateSet( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES;
- if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
else
p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
/* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
- if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
cfg->outputFormat = FAAD_FMT_FLOAT;
else
cfg->outputFormat = FAAD_FMT_16BIT;
}
/* Do the actual reordering */
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+ if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU )
for( i = 0; i < i_samples; i++ )
for( j = 0; j < i_nb_channels; j++ )
p_out[i * i_nb_channels + pi_chan_table[j]] =
decoder_sys_t *p_sys;
vlc_value_t lockval;
- var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+ var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
vlc_value_t val;
vlc_value_t lockval;
- var_Get( p_enc->p_libvlc, "avcodec", &lockval );
+ var_Get( p_enc->p_libvlc_global, "avcodec", &lockval );
if( !E_(GetFfmpegCodec)( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
/* Set CPU capabilities */
p_context->dsp_mask = 0;
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
p_context->dsp_mask |= FF_MM_MMX;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
p_context->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
{
p_context->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
p_context->dsp_mask |= FF_MM_SSE;
p_context->dsp_mask |= FF_MM_SSE2;
encoder_sys_t *p_sys = p_enc->p_sys;
vlc_value_t lockval;
- var_Get( p_enc->p_libvlc, "avcodec", &lockval );
+ var_Get( p_enc->p_libvlc_global, "avcodec", &lockval );
#if LIBAVCODEC_BUILD >= 4702
if ( p_sys->b_inited && p_enc->i_threads >= 1 )
set_description( _("FFmpeg deinterlace video filter") );
add_shortcut( "ffmpeg-deinterlace" );
- var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
/*****************************************************************************
/* Set CPU capabilities */
p_context->dsp_mask = 0;
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
p_context->dsp_mask |= FF_MM_MMX;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
p_context->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
{
p_context->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
p_context->dsp_mask |= FF_MM_SSE;
}
- if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+ if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) )
{
p_context->dsp_mask |= FF_MM_SSE2;
}
decoder_sys_t *p_sys = p_dec->p_sys;
vlc_value_t lockval;
- var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+ var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
switch( p_sys->i_cat )
{
static int b_ffmpeginit = 0;
vlc_value_t lockval;
- var_Get( p_object->p_libvlc, "avcodec", &lockval );
+ var_Get( p_object->p_libvlc_global, "avcodec", &lockval );
vlc_mutex_lock( lockval.p_address );
/* *** init ffmpeg library (libavcodec) *** */
int i_width, int i_height, int pix_fmt )
{
video_postproc_sys_t *p_sys = (video_postproc_sys_t *)p_data;
- int32_t i_cpu = p_dec->p_libvlc->i_cpu;
+ int32_t i_cpu = p_dec->p_libvlc_global->i_cpu;
int i_flags = 0;
/* Set CPU capabilities */
vlc_value_t lockval;
vlc_value_t val;
- var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+ var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
}
p_sys->p_buffer = p_sys->p_buffer_orig;
p_sys->i_buffer = p_block->i_buffer;
- p_dec->p_vlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer,
+ p_dec->p_libvlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer,
p_block->i_buffer );
memset( p_sys->p_buffer + p_block->i_buffer, 0,
FF_INPUT_BUFFER_PADDING_SIZE );
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_size );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_size );
p_src += i_src_stride;
p_dst += i_dst_stride;
}
p_sys->b_preroll = VLC_FALSE;
#if defined( __i386__ ) || defined( __x86_64__ )
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX )
+ if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX )
{
i_accel |= MPEG2_ACCEL_X86_MMX;
}
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW )
+ if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW )
{
i_accel |= MPEG2_ACCEL_X86_3DNOW;
}
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+ if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
{
i_accel |= MPEG2_ACCEL_X86_MMXEXT;
}
#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC )
+ if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_ALTIVEC )
{
i_accel |= MPEG2_ACCEL_PPC_ALTIVEC;
}
p_sys->p_decoder->sync();
p_sys->i_counter = 0;
p_frame = p_sys->p_decoder->frame();
- p_dec->p_vlc->pf_memcpy( p_pic->p[0].p_pixels, p_frame, i_width*i_height );
+ p_dec->p_libvlc->pf_memcpy( p_pic->p[0].p_pixels, p_frame, i_width*i_height );
p_frame += i_width * i_height;
- p_dec->p_vlc->pf_memcpy( p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
+ p_dec->p_libvlc->pf_memcpy( p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
p_frame += i_width * i_height/4;
- p_dec->p_vlc->pf_memcpy( p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
+ p_dec->p_libvlc->pf_memcpy( p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
p_pic->date = p_sys->i_pts;
}
block_Release( p_block);
decoder_t *p_dec = (decoder_t*)p_this;
/* create a mutex */
- var_Create( p_this->p_libvlc, "qt_mutex", VLC_VAR_MUTEX );
+ var_Create( p_this->p_libvlc_global, "qt_mutex", VLC_VAR_MUTEX );
switch( p_dec->fmt_in.i_codec )
{
vlc_value_t lockval;
/* get lock, avoid segfault */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
+ var_Get( p_dec->p_libvlc_global, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( p_dec->fmt_out.i_cat == AUDIO_ES )
#endif
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_dec->p_libvlc, "qt_mutex" );
+ var_Destroy( p_dec->p_libvlc_global, "qt_mutex" );
if( p_sys ) free( p_sys );
}
memcpy( fcc, &p_dec->fmt_in.i_codec, 4 );
/* get lock, avoid segfault */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
+ var_Get( p_dec->p_libvlc_global, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
#ifdef __APPLE__
int i_frames = p_sys->i_buffer / p_sys->InFrameSize;
unsigned long i_out_frames, i_out_bytes;
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
+ var_Get( p_dec->p_libvlc_global, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
i_error = p_sys->SoundConverterConvertBuffer( p_sys->myConverter,
p_sys->p_buffer,
fcc, p_dec->fmt_in.video.i_width, p_dec->fmt_in.video.i_height );
/* get lock, avoid segfault */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
+ var_Get( p_dec->p_libvlc_global, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
#ifdef __APPLE__
return NULL;
}
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
+ var_Get( p_dec->p_libvlc_global, "qt_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( ( p_pic = p_dec->pf_vout_buffer_new( p_dec ) ) )
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
p_src += p_sys->b_invert ? -i_width : i_width;
p_dst += p_pic->p[i_plane].i_pitch;
}
for( j = 0; j < pic.p[i].i_visible_lines / 2; j++ )
{
- p_dec->p_vlc->pf_memcpy( p_tmp, p_bottom,
+ p_dec->p_libvlc->pf_memcpy( p_tmp, p_bottom,
pic.p[i].i_visible_pitch );
- p_dec->p_vlc->pf_memcpy( p_bottom, p_top,
+ p_dec->p_libvlc->pf_memcpy( p_bottom, p_top,
pic.p[i].i_visible_pitch );
- p_dec->p_vlc->pf_memcpy( p_top, p_tmp,
+ p_dec->p_libvlc->pf_memcpy( p_top, p_tmp,
pic.p[i].i_visible_pitch );
p_top += i_pitch;
p_bottom -= i_pitch;
for ( i = 0; i < p_surface->h; i++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_pitch );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_pitch );
p_src += p_surface->pitch;
p_dst += p_pic->p[0].i_pitch;
}
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_src_stride );
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_src_stride );
p_src += i_src_stride;
p_dst += i_dst_stride;
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src + i_src_xoffset,
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src + i_src_xoffset,
i_plane ? yuv->uv_width : yuv->y_width );
p_src += i_src_stride;
p_dst += i_dst_stride;
p_sys->p_out_buffer, MAX_CODED_FRAME_SIZE );
p_sys->i_nb_samples = 0;
p_block = block_New( p_enc, i_used );
- p_enc->p_vlc->pf_memcpy( p_block->p_buffer, p_sys->p_out_buffer,
+ p_enc->p_libvlc->pf_memcpy( p_block->p_buffer, p_sys->p_out_buffer,
i_used );
p_block->i_length = (mtime_t)1000000 *
(mtime_t)MPEG_FRAME_SIZE / (mtime_t)p_enc->fmt_out.audio.i_rate;
p_sys->param.i_fps_num = p_enc->fmt_in.video.i_frame_rate;
p_sys->param.i_fps_den = p_enc->fmt_in.video.i_frame_rate_base;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
p_sys->param.cpu &= ~X264_CPU_MMX;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
p_sys->param.cpu &= ~X264_CPU_MMXEXT;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
p_sys->param.cpu &= ~X264_CPU_SSE;
}
- if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+ if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) )
{
p_sys->param.cpu &= ~X264_CPU_SSE2;
}
break;
case GESTURE(DOWN,RIGHT,NONE,NONE):
/* FIXME: Should close the vout!"*/
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
break;
case GESTURE(DOWN,LEFT,UP,RIGHT):
msg_Dbg(p_intf, "a square was drawn!" );
p_intf->p_sys->p_input = NULL;
p_intf->p_sys->p_vout = NULL;
- var_AddCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
return 0;
}
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- var_DelCallback( p_intf->p_vlc, "key-pressed", KeyEvent, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
if( p_intf->p_sys->p_input )
{
vlc_object_release( p_intf->p_sys->p_input );
input_thread_t *p_input = NULL;
vout_thread_t *p_vout = NULL;
vout_thread_t *p_last_vout = NULL;
- struct hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
vlc_value_t val;
int i;
/* Initialize hotkey structure */
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
- var_Create( p_intf->p_vlc, p_hotkeys[i].psz_action,
+ var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action,
VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );
- var_AddCallback( p_intf->p_vlc, p_hotkeys[i].psz_action,
+ var_AddCallback( p_intf->p_libvlc, p_hotkeys[i].psz_action,
ActionKeyCB, NULL );
- var_Get( p_intf->p_vlc, p_hotkeys[i].psz_action, &val );
- var_Set( p_intf->p_vlc, p_hotkeys[i].psz_action, val );
+ var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val );
+ var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
}
while( !p_intf->b_die )
vlc_object_release( p_playlist );
}
/* Playlist is stopped now kill vlc. */
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
ClearChannels( p_intf, p_vout );
vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
continue;
static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- vlc_t *p_vlc = (vlc_t *)p_this;
- struct hotkey *p_hotkeys = p_vlc->p_hotkeys;
+ libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this;
+ struct hotkey *p_hotkeys = p_libvlc->p_hotkeys;
mtime_t i_date;
int i;
char *psz_src;
char psz_tmp[10];
- var_Create(p_intf->p_libvlc, "http-host", VLC_VAR_STRING );
- psz_address=var_GetString(p_intf->p_libvlc, "http-host");
+ var_Create(p_intf->p_libvlc_global, "http-host", VLC_VAR_STRING );
+ psz_address=var_GetString(p_intf->p_libvlc_global, "http-host");
if( !psz_address || !*psz_address )
{
psz_address = config_GetPsz( p_intf, "http-host" );
/* Ugly hack to allow to run several HTTP servers on different ports. */
sprintf( psz_tmp, "%s:%d", psz_address, i_port + 1 );
- var_SetString( p_intf->p_libvlc, "http-host", psz_tmp );
+ var_SetString( p_intf->p_libvlc_global, "http-host", psz_tmp );
msg_Dbg( p_intf, "base %s:%d", psz_address, i_port );
#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL )
{
- char * psz_vlcpath = p_intf->p_libvlc->psz_vlcpath;
+ char * psz_vlcpath = p_intf->p_libvlc_global->psz_vlcpath;
psz_src = malloc( strlen(psz_vlcpath) + strlen("/share/http" ) + 1 );
if( !psz_src ) return VLC_ENOMEM;
#if defined(WIN32)
case MVLC_SHUTDOWN:
{
msg_Dbg( p_intf, "requested shutdown" );
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
break;
}
/* vlm */
if( !strcmp( psz_object, "VLC_OBJECT_ROOT" ) )
i_object_type = VLC_OBJECT_ROOT;
- else if( !strcmp( psz_object, "VLC_OBJECT_VLC" ) )
- p_object = VLC_OBJECT(p_intf->p_vlc);
+ else if( !strcmp( psz_object, "VLC_OBJECT_LIBVLC" ) )
+ p_object = VLC_OBJECT(p_intf->p_libvlc);
else if( !strcmp( psz_object, "VLC_OBJECT_INTF" ) )
p_object = VLC_OBJECT(p_intf);
else if( !strcmp( psz_object, "VLC_OBJECT_PLAYLIST" ) )
if( psz_dir[0] == '~' )
{
char *dir = malloc( strlen(psz_dir)
- + strlen(p_intf->p_vlc->psz_userdir) );
+ + strlen(p_intf->p_libvlc->psz_userdir) );
/* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( dir, "%s%s", p_intf->p_vlc->psz_userdir, psz_dir + 1 );
+ sprintf( dir, "%s%s", p_intf->p_libvlc->psz_userdir, psz_dir + 1 );
free( psz_dir );
psz_dir = dir;
}
break;
}
keyval.i_int = config_GetInt( p_intf, c );
- var_Set( p_intf->p_vlc, "key-pressed", keyval );
+ var_Set( p_intf->p_libvlc, "key-pressed", keyval );
}
free( code );
}
}
/* Make sure we exit (In case other interfaces have been spawned) */
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
}
/*****************************************************************************
/* status callbacks */
/* Listen to audio volume updates */
- var_AddCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
#ifdef WIN32
/* Get the file descriptor of the console input */
psz_cmd, i_ret, vlc_error( i_ret ) );
}
/* Or maybe it's a global command */
- else if( var_Type( p_intf->p_libvlc, psz_cmd ) & VLC_VAR_ISCOMMAND )
+ else if( var_Type( p_intf->p_libvlc_global, psz_cmd ) & VLC_VAR_ISCOMMAND )
{
vlc_value_t val;
int i_ret;
val.psz_string = psz_arg;
/* FIXME: it's a global command, but we should pass the
- * local object as an argument, not p_intf->p_libvlc. */
- i_ret = var_Set( p_intf->p_libvlc, psz_cmd, val );
+ * local object as an argument, not p_intf->p_libvlc_global. */
+ i_ret = var_Set( p_intf->p_libvlc_global, psz_cmd, val );
if( i_ret != 0 )
{
msg_rc( "%s: returned %i (%s)",
p_playlist = NULL;
}
- var_DelCallback( p_intf->p_vlc, "volume-change", VolumeChanged, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "volume-change", VolumeChanged, p_intf );
}
static void Help( intf_thread_t *p_intf, vlc_bool_t b_longhelp)
if( !strcmp( psz_cmd, "pause" ) )
{
val.i_int = config_GetInt( p_intf, "key-play-pause" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "fastforward" ) )
{
val.i_int = config_GetInt( p_intf, "key-jump+extrashort" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "rewind" ) )
{
val.i_int = config_GetInt( p_intf, "key-jump-extrashort" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
vlc_object_release( p_input );
return VLC_SUCCESS;
}
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "marq-marquee", val );
+ var_Set( p_input->p_libvlc_global, "marq-marquee", val );
}
else
{
val.psz_string = "";
- var_Set( p_input->p_libvlc, "marq-marquee", val);
+ var_Set( p_input->p_libvlc_global, "marq-marquee", val);
}
}
else if( !strcmp( psz_cmd, "marq-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-x", val );
+ var_Set( p_input->p_libvlc_global, "marq-x", val );
}
}
else if( !strcmp( psz_cmd, "marq-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-y", val );
+ var_Set( p_input->p_libvlc_global, "marq-y", val );
}
}
else if( !strcmp( psz_cmd, "marq-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-position", val );
+ var_Set( p_input->p_libvlc_global, "marq-position", val );
}
}
else if( !strcmp( psz_cmd, "marq-color" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "marq-color", val );
+ var_Set( p_input->p_libvlc_global, "marq-color", val );
}
}
else if( !strcmp( psz_cmd, "marq-opacity" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "marq-opacity", val );
+ var_Set( p_input->p_libvlc_global, "marq-opacity", val );
}
}
else if( !strcmp( psz_cmd, "marq-size" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "marq-size", val );
+ var_Set( p_input->p_libvlc_global, "marq-size", val );
}
}
else if( !strcmp( psz_cmd, "marq-timeout" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-alpha", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-alpha", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-height" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-height", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-height", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-width" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-width", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-width", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-xoffset" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-xoffset", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-xoffset", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-yoffset" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-yoffset", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-yoffset", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-align" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-align", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-align", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-vborder" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-vborder", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-vborder", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-hborder" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-hborder", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-hborder", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-position", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-position", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-rows" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-rows", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-rows", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-cols" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-cols", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-cols", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-order" ) )
if( strlen( newval.psz_string ) > 0)
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "mosaic-order", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-order", val );
}
}
else if( !strcmp( psz_cmd, "mosaic-keep-aspect-ratio" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "mosaic-keep-aspect-ratio", val );
+ var_Set( p_input->p_libvlc_global, "mosaic-keep-aspect-ratio", val );
}
}
else if( !strcmp( psz_cmd, "time-format" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "time-format", val );
+ var_Set( p_input->p_libvlc_global, "time-format", val );
}
else
{
val.psz_string = "";
- var_Set( p_input->p_libvlc, "time-format", val);
+ var_Set( p_input->p_libvlc_global, "time-format", val);
}
}
else if( !strcmp( psz_cmd, "time-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-x", val );
+ var_Set( p_input->p_libvlc_global, "time-x", val );
}
}
else if( !strcmp( psz_cmd, "time-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-y", val );
+ var_Set( p_input->p_libvlc_global, "time-y", val );
}
}
else if( !strcmp( psz_cmd, "time-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-position", val );
+ var_Set( p_input->p_libvlc_global, "time-position", val );
}
}
else if( !strcmp( psz_cmd, "time-color" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "time-color", val );
+ var_Set( p_input->p_libvlc_global, "time-color", val );
}
}
else if( !strcmp( psz_cmd, "time-opacity" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "time-opacity", val );
+ var_Set( p_input->p_libvlc_global, "time-opacity", val );
}
}
else if( !strcmp( psz_cmd, "time-size" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "time-size", val );
+ var_Set( p_input->p_libvlc_global, "time-size", val );
}
}
else if( !strcmp( psz_cmd, "logo-file" ) )
if( strlen( newval.psz_string ) > 0 )
{
val.psz_string = newval.psz_string;
- var_Set( p_input->p_libvlc, "logo-file", val );
+ var_Set( p_input->p_libvlc_global, "logo-file", val );
}
}
else if( !strcmp( psz_cmd, "logo-x" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-x", val );
+ var_Set( p_input->p_libvlc_global, "logo-x", val );
}
}
else if( !strcmp( psz_cmd, "logo-y" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-y", val );
+ var_Set( p_input->p_libvlc_global, "logo-y", val );
}
}
else if( !strcmp( psz_cmd, "logo-position" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = atoi( newval.psz_string );
- var_Set( p_input->p_libvlc, "logo-position", val );
+ var_Set( p_input->p_libvlc_global, "logo-position", val );
}
}
else if( !strcmp( psz_cmd, "logo-transparency" ) )
if( strlen( newval.psz_string ) > 0)
{
val.i_int = strtol( newval.psz_string, NULL, 0 );
- var_Set( p_input->p_libvlc, "logo-transparency", val );
+ var_Set( p_input->p_libvlc_global, "logo-transparency", val );
}
}
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
- p_this->p_vlc->b_die = VLC_TRUE;
+ p_this->p_libvlc->b_die = VLC_TRUE;
return VLC_SUCCESS;
}
{
intf_thread_t *p_newintf = NULL;
- p_newintf = intf_Create( p_this->p_vlc, newval.psz_string, 0, NULL );
+ p_newintf = intf_Create( p_this->p_libvlc, newval.psz_string, 0, NULL );
if( p_newintf )
{
p_newintf->b_block = VLC_FALSE;
vlc_value_t keyval;
keyval.i_int = config_GetInt( p_intf, "key-vol-mute" );
- var_Set( p_intf->p_vlc, "key-pressed", keyval );
+ var_Set( p_intf->p_libvlc, "key-pressed", keyval );
}
i_error = aout_VolumeSet( p_this, i_volume );
osd_Volume( p_this );
vlc_object_release( p_input );
}
- i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
if ( i_nb_steps <= 0 || i_nb_steps > (AOUT_VOLUME_MAX/i_volume_step) )
{
i_nb_steps = 1;
else if( !strncmp( cl->buffer_read, "shutdown", 8 ) )
{
msg_Err( p_intf, "shutdown requested" );
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
}
else
{
p_ev->b_key = VLC_FALSE;
/* catch all key event */
- var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev );
+ var_AddCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev );
/* main loop */
while( !p_ev->b_die )
if( p_ev->b_key )
{
vlc_value_t valk;
- struct vlc_t::hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys;
+ struct libvlc_int_t::hotkey *p_hotkeys = p_ev->p_libvlc->p_hotkeys;
int i, i_action = -1;
msg_Dbg( p_ev->p_demux, "Handle Key Event");
pci_t *pci = (pci_t *) &p_sys->pci_packet;
- var_Get( p_ev->p_vlc, "key-pressed", &valk );
+ var_Get( p_ev->p_libvlc, "key-pressed", &valk );
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
if( p_hotkeys[i].i_key == valk.i_int )
var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev );
vlc_object_release( p_vout );
}
- var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev );
+ var_DelCallback( p_ev->p_libvlc, "key-pressed", EventKey, p_ev );
vlc_mutex_destroy( &p_ev->lock );
if( p_box->i_type == FOURCC_drms )
{
p_box->data.p_sample_soun->p_drms =
- drms_alloc( p_stream->p_vlc->psz_homedir );
+ drms_alloc( p_stream->p_libvlc->psz_homedir );
if( p_box->data.p_sample_soun->p_drms == NULL )
{
if( p_aout_buffer != NULL )
{
- p_aout->p_vlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer,
+ p_aout->p_libvlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer,
MIN( i_size, p_aout_buffer->i_nb_bytes ) );
if( p_aout_buffer->i_nb_bytes < i_size )
{
- p_aout->p_vlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes,
+ p_aout->p_libvlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes,
0, i_size - p_aout_buffer->i_nb_bytes );
}
aout_BufferFree( p_aout_buffer );
}
else
{
- p_aout->p_vlc->pf_memset( p_buffer, 0, i_size );
+ p_aout->p_libvlc->pf_memset( p_buffer, 0, i_size );
}
}
{
val.i_int |= KEY_MODIFIER_SHIFT;
}
- var_Set( p_intf->p_vlc, fName, val );
+ var_Set( p_intf->p_libvlc, fName, val );
}
}
else
{
val.i_int |= KEY_MODIFIER_CTRL;
}
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
free( keys );
free( chars );
}
val.i_int = config_GetInt( p_intf, "key-play-pause" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
/* Small helper method */
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-stop" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)faster:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-faster" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)slower:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-slower" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)prev:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-prev" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)next:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-next" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)random:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-jump+short" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
- (IBAction)backward:(id)sender
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-jump-short" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-vol-up" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
/* Manage volume status */
[o_main manageVolumeSlider];
}
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-vol-down" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
/* Manage volume status */
[o_main manageVolumeSlider];
}
vlc_value_t val;
intf_thread_t * p_intf = VLCIntf;
val.i_int = config_GetInt( p_intf, "key-vol-mute" );
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
/* Manage volume status */
[o_main manageVolumeSlider];
}
intf_thread_t * p_intf = VLCIntf;
audio_volume_t i_volume = (audio_volume_t)[sender intValue];
int i_volume_step = 0;
- i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
aout_VolumeSet( p_intf, i_volume * i_volume_step );
/* Manage volume status */
[o_main manageVolumeSlider];
int i;
val.i_int = 0;
- p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ p_hotkeys = p_intf->p_libvlc->p_hotkeys;
i_pressed_modifiers = [o_event modifierFlags];
{
if( p_hotkeys[i].i_key == val.i_int )
{
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
return YES;
}
}
{
vlc_value_t val;
- if( p_intf->p_vlc->b_die == VLC_TRUE )
+ if( p_intf->p_libvlc->b_die == VLC_TRUE )
{
[o_timer invalidate];
return;
o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
if( i_lastShownVolume != -1 )
[self setScrollField:o_text stopAfter:1000000];
- i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
[o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
[o_volumeslider setEnabled: TRUE];
p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
case CONFIG_ITEM_KEY:
/* So you don't need to restart to have the changes take effect */
val.i_int = [self intValue];
- var_Set( VLCIntf->p_vlc, psz_name, val );
+ var_Set( VLCIntf->p_libvlc, psz_name, val );
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_BOOL:
config_PutInt( VLCIntf, psz_name, [self intValue] );
}
if( p_input )
- var_Set( p_input->p_libvlc, "marq-marquee", val );
+ var_Set( p_input->p_libvlc_global, "marq-marquee", val );
config_PutPsz( p_intf, "marq-marquee", val.psz_string );
}
val.i_int = [[o_marq_pos_radio selectedCell] tag];
if( p_input )
- var_Set( p_input->p_libvlc, "marq-position", val );
+ var_Set( p_input->p_libvlc_global, "marq-position", val );
config_PutInt( p_intf, "marq-position", val.i_int );
}
indexOfSelectedItem]] objectAtIndex: 1] UTF8String], NULL, 0 );
if( p_input )
- var_Set( p_input->p_libvlc, "marq-color", val );
+ var_Set( p_input->p_libvlc_global, "marq-color", val );
config_PutInt( p_intf, "marq-color", val.i_int );
}
val.i_int = [o_marq_opaque_sld intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "marq-opacity", val );
+ var_Set( p_input->p_libvlc_global, "marq-opacity", val );
config_PutInt( p_intf, "marq-opacity", val.i_int );
}
val.i_int = [[o_marq_size_pop titleOfSelectedItem] intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "marq-size", val );
+ var_Set( p_input->p_libvlc_global, "marq-size", val );
config_PutInt( p_intf, "marq-size", val.i_int );
}
val.i_int = [o_marq_tmOut_fld intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "marq-timeout", val );
+ var_Set( p_input->p_libvlc_global, "marq-timeout", val );
config_PutInt( p_intf, "marq-timeout", val.i_int );
}
}
if( p_input )
- var_Set( p_input->p_libvlc, "time-format", val );
+ var_Set( p_input->p_libvlc_global, "time-format", val );
config_PutPsz( p_intf, "time-format", val.psz_string );
}
val.i_int = [[o_time_pos_radio selectedCell] tag];
if( p_input )
- var_Set( p_input->p_libvlc, "time-position", val );
+ var_Set( p_input->p_libvlc_global, "time-position", val );
config_PutInt( p_intf, "time-position", val.i_int );
}
indexOfSelectedItem]] objectAtIndex: 1] UTF8String], NULL, 0 );
if( p_input )
- var_Set( p_input->p_libvlc, "time-color", val );
+ var_Set( p_input->p_libvlc_global, "time-color", val );
config_PutInt( p_intf, "time-color", val.i_int );
}
val.i_int = [o_time_opaque_sld intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "time-opacity", val );
+ var_Set( p_input->p_libvlc_global, "time-opacity", val );
config_PutInt( p_intf, "time-opacity", val.i_int );
}
val.i_int = [[o_time_size_pop titleOfSelectedItem] intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "time-size", val );
+ var_Set( p_input->p_libvlc_global, "time-size", val );
config_PutInt( p_intf, "time-size", val.i_int );
}
val.i_int = [o_logo_opaque_sld intValue];
if( p_input )
- var_Set( p_input->p_libvlc, "logo-transparency", val );
+ var_Set( p_input->p_libvlc_global, "logo-transparency", val );
config_PutInt( p_intf, "logo-transparency", val.i_int );
}
val.i_int = [[o_logo_pos_radio selectedCell] tag];
if( p_input )
- var_Set( p_input->p_libvlc, "logo-position", val );
+ var_Set( p_input->p_libvlc_global, "logo-position", val );
config_PutInt( p_intf, "logo-position", val.i_int );
}
vout_thread_t *p_vout = (vout_thread_t *)p_this;
msg_Dbg( p_vout, "set %d", new_val.i_int );
- var_Create( p_vout->p_vlc, "video-device", VLC_VAR_INTEGER );
- var_Set( p_vout->p_vlc, "video-device", new_val );
+ var_Create( p_vout->p_libvlc, "video-device", VLC_VAR_INTEGER );
+ var_Set( p_vout->p_libvlc, "video-device", new_val );
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
p_real_vout = [VLCVoutView getRealVout: p_vout];
/* Get the pref value when this is the first time, otherwise retrieve the device from the top level video-device var */
- if( var_Type( p_real_vout->p_vlc, "video-device" ) == 0 )
+ if( var_Type( p_real_vout->p_libvlc, "video-device" ) == 0 )
{
i_device = var_GetInteger( p_vout, "macosx-vdev" );
}
else
{
- i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
+ i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
}
/* Setup the menuitem for the multiple displays. */
{
vlc_value_t val;
val.i_int = config_GetInt( p_vout, "key-play-pause" );
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
else
{
val.i_int |= CocoaKeyToVLC( key );
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
}
else
id o_return = nil;
vout_thread_t * p_real_vout = [VLCVoutView getRealVout: p_vout];
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+ var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
b_init_ok = VLC_FALSE;
p_real_vout = [VLCVoutView getRealVout: p_vout];
- i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
- b_black = var_GetBool( p_real_vout->p_vlc, "macosx-black" );
+ i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
+ b_black = var_GetBool( p_real_vout->p_libvlc, "macosx-black" );
/* Find out on which screen to open the window */
if( i_device <= 0 || i_device > (int)[o_screens count] )
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+ var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
if( value_drawable.i_int != 0 )
{
static const GLint ATTRIBUTES[] = {
Rect viewBounds;
Rect clipBounds;
- var_Get( p_vout->p_vlc, "drawable", &val );
+ var_Get( p_vout->p_libvlc, "drawable", &val );
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
- var_Get( p_vout->p_vlc, "drawable-view-top", &val );
+ var_Get( p_vout->p_libvlc, "drawable-view-top", &val );
viewBounds.top = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-view-left", &val );
+ var_Get( p_vout->p_libvlc, "drawable-view-left", &val );
viewBounds.left = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-view-bottom", &val );
+ var_Get( p_vout->p_libvlc, "drawable-view-bottom", &val );
viewBounds.bottom = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-view-right", &val );
+ var_Get( p_vout->p_libvlc, "drawable-view-right", &val );
viewBounds.right = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-clip-top", &val );
+ var_Get( p_vout->p_libvlc, "drawable-clip-top", &val );
clipBounds.top = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-clip-left", &val );
+ var_Get( p_vout->p_libvlc, "drawable-clip-left", &val );
clipBounds.left = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-clip-bottom", &val );
+ var_Get( p_vout->p_libvlc, "drawable-clip-bottom", &val );
clipBounds.bottom = val.i_int;
- var_Get( p_vout->p_vlc, "drawable-clip-right", &val );
+ var_Get( p_vout->p_libvlc, "drawable-clip-right", &val );
clipBounds.right = val.i_int;
aglSetViewport(p_vout, viewBounds, clipBounds);
/* Are we embedded? If so, the drawable value will be a pointer to a
* CGrafPtr that we're expected to use */
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+ var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
if( value_drawable.i_int != 0 )
p_vout->p_sys->b_embedded = VLC_TRUE;
else
p_vout->p_sys->b_embedded = VLC_FALSE;
- p_vout->p_sys->b_cpu_has_simd = (p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC)
- | (p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT);
+ p_vout->p_sys->b_cpu_has_simd = (p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_ALTIVEC)
+ | (p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT);
msg_Dbg( p_vout, "we do%s have SIMD enabled CPU", p_vout->p_sys->b_cpu_has_simd ? "" : "n't" );
/* Initialize QuickTime */
return VLC_EGENERIC;
}
- /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
- vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
+ /* Damn QT isn't thread safe. so keep a lock in the p_libvlc object */
+ vlc_mutex_lock( &p_vout->p_libvlc->quicktime_lock );
/* Can we find the right chroma ? */
if( p_vout->p_sys->b_cpu_has_simd )
err = FindCodec( kYUV420CodecType, bestSpeedCodec,
nil, &p_vout->p_sys->img_dc );
}
- vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
+ vlc_mutex_unlock( &p_vout->p_libvlc->quicktime_lock );
if( err == noErr && p_vout->p_sys->img_dc != 0 )
{
/* Create the clipping mask */
p_vout->p_sys->clip_mask = NewRgn();
UpdateEmbeddedGeometry(p_vout);
- var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+ var_AddCallback(p_vout->p_libvlc, "drawableredraw", DrawableRedraw, p_vout);
}
QTScaleMatrix( p_vout );
if( !p_vout->b_fullscreen && p_vout->p_sys->b_embedded )
{
- var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+ var_DelCallback(p_vout->p_libvlc, "drawableredraw", DrawableRedraw, p_vout);
DisposeRgn(p_vout->p_sys->clip_mask);
}
}
else
{
- var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+ var_DelCallback(p_vout->p_libvlc, "drawableredraw", DrawableRedraw, p_vout);
DisposeRgn(p_vout->p_sys->clip_mask);
}
}
/* Create the clipping mask */
p_vout->p_sys->clip_mask = NewRgn();
UpdateEmbeddedGeometry(p_vout);
- var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+ var_AddCallback(p_vout->p_libvlc, "drawableredraw", DrawableRedraw, p_vout);
}
QTScaleMatrix( p_vout );
vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh,
valportx, valporty;
- var_Get( p_vout->p_vlc, "drawable", &val );
- var_Get( p_vout->p_vlc, "drawablet", &valt );
- var_Get( p_vout->p_vlc, "drawablel", &vall );
- var_Get( p_vout->p_vlc, "drawableb", &valb );
- var_Get( p_vout->p_vlc, "drawabler", &valr );
- var_Get( p_vout->p_vlc, "drawablex", &valx );
- var_Get( p_vout->p_vlc, "drawabley", &valy );
- var_Get( p_vout->p_vlc, "drawablew", &valw );
- var_Get( p_vout->p_vlc, "drawableh", &valh );
- var_Get( p_vout->p_vlc, "drawableportx", &valportx );
- var_Get( p_vout->p_vlc, "drawableporty", &valporty );
+ var_Get( p_vout->p_libvlc, "drawable", &val );
+ var_Get( p_vout->p_libvlc, "drawablet", &valt );
+ var_Get( p_vout->p_libvlc, "drawablel", &vall );
+ var_Get( p_vout->p_libvlc, "drawableb", &valb );
+ var_Get( p_vout->p_libvlc, "drawabler", &valr );
+ var_Get( p_vout->p_libvlc, "drawablex", &valx );
+ var_Get( p_vout->p_libvlc, "drawabley", &valy );
+ var_Get( p_vout->p_libvlc, "drawablew", &valw );
+ var_Get( p_vout->p_libvlc, "drawableh", &valh );
+ var_Get( p_vout->p_libvlc, "drawableportx", &valportx );
+ var_Get( p_vout->p_libvlc, "drawableporty", &valporty );
/* portx, porty contains values for SetOrigin() function
which isn't used, instead use QT Translate matrix */
/* reset drawableredraw variable indicating we are ready
to take changes in video geometry */
val.i_int=0;
- var_Set( p_vout->p_vlc, "drawableredraw", val );
+ var_Set( p_vout->p_libvlc, "drawableredraw", val );
}
/*****************************************************************************
/* Set quiet mode */
val.i_int = -1;
- var_Set( p_intf->p_vlc, "verbose", val );
+ var_Set( p_intf->p_libvlc, "verbose", val );
/* Set defaul playlist view */
p_sys->i_current_view = VIEW_CATEGORY;
}
else
{
- p_sys->psz_current_dir = strdup( p_intf->p_vlc->psz_homedir );
+ p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
}
p_sys->i_dir_entries = 0;
case 'q':
case 'Q':
case 0x1b: /* Esc */
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
return 0;
/* Box switching */
/* Sleep to avoid using all CPU - since some interfaces need to
* access keyboard events, a 100ms delay is a good compromise */
gdk_threads_leave();
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_intf->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
msleep( INTF_IDLE_SLEEP );
else
msleep( 1000 );
msg_Dbg( p_intf, "Manage GTK keyboard events using timeouts" );
/* Sleep to avoid using all CPU - since some interfaces needs to access
* keyboard events, a 1000ms delay is a good compromise */
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_intf->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
i_dummy = gtk_timeout_add( INTF_IDLE_SLEEP / 1000, (GtkFunction)Manage, p_intf );
else
i_dummy = gtk_timeout_add( 1000, (GtkFunction)Manage, p_intf );
i_time = var_GetTime( p_intf->p_sys->p_input, "time" );
i_length = var_GetTime( p_intf->p_sys->p_input, "length" );
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_intf->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
{
/* Manage the slider for CPU_CAPABILITY_FPU hardware */
if( p_intf->p_sys->b_playing )
intf_thread_t *p_intf = GtkGetIntf( widget );
vlc_mutex_lock( &p_intf->change_lock );
- p_intf->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_libvlc->b_die = VLC_TRUE;
vlc_mutex_unlock( &p_intf->change_lock );
msg_Dbg( p_intf, "about to exit vlc ... signaled" );
switch( p_ev->event_f )
{
case Ph_WM_CLOSE:
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
case Ph_WM_MOVE:
{
case Pk_q:
case Pk_Q:
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
case Pk_f:
{
QString saveLogFileName = QFileDialog::getSaveFileName(
this, qtr("Choose a filename to save the logs under..."),
- p_intf->p_vlc->psz_homedir,
+ p_intf->p_libvlc->psz_homedir,
"Texts / Logs (*.log *.txt);; All (*.*) ");
if( saveLogFileName != NULL )
FileTypes += ");; All Files (*.*)" ;
FileTypes.replace(QString(";*"), QString(" *"));
return QFileDialog::getOpenFileNames( NULL, qfu(I_POP_SEL_FILES ),
- p_intf->p_vlc->psz_homedir, FileTypes );
+ p_intf->p_libvlc->psz_homedir, FileTypes );
}
void DialogsProvider::bookmarksDialog()
}
if( i_vlck >= 0 )
{
- var_SetInteger( p_intf->p_vlc, "key-pressed", i_vlck );
+ var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
e->accept();
}
else
val.i_int |= KEY_MODIFIER_SHIFT;
}
- var_Set( getIntf()->p_vlc, "key-pressed", val );
+ var_Set( getIntf()->p_libvlc, "key-pressed", val );
}
// Always store the modifier, which can be needed for scroll events
// Add the modifiers
val.i_int |= m_currModifier;
- var_Set( getIntf()->p_vlc, "key-pressed", val );
+ var_Set( getIntf()->p_libvlc, "key-pressed", val );
}
}
void VlcProc::manage()
{
// Did the user request to quit vlc ?
- if( getIntf()->b_die || getIntf()->p_vlc->b_die )
+ if( getIntf()->b_die || getIntf()->p_libvlc->b_die )
{
CmdQuit *pCmd = new CmdQuit( getIntf() );
AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
}
// Initialize the resource path
- m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_homedir +
"\\" + CONFIG_DIR + "\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
"\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
"\\skins2" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
"\\share\\skins" );
- m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_vlcpath +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
"\\share\\skins2" );
// All went well
ConnectionNumber( pDisplay ) );
// Initialize the resource path
- m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir +
+ m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_homedir +
m_dirSep + CONFIG_DIR + "/skins2" );
m_resourcePath.push_back( (string)"share/skins2" );
m_resourcePath.push_back( (string)DATA_PATH + "/skins2" );
{
case VLC_MSG_ERR:
case VLC_MSG_INFO:
- if( p_intf->p_libvlc->i_verbose < 0 ) continue;
+ if( p_intf->p_libvlc_global->i_verbose < 0 ) continue;
break;
case VLC_MSG_WARN:
- if( p_intf->p_libvlc->i_verbose < 1 ) continue;
+ if( p_intf->p_libvlc_global->i_verbose < 1 ) continue;
break;
case VLC_MSG_DBG:
- if( p_intf->p_libvlc->i_verbose < 2 ) continue;
+ if( p_intf->p_libvlc_global->i_verbose < 2 ) continue;
break;
}
case CONFIG_ITEM_KEY:
/* So you don't need to restart to have the changes take effect */
val.i_int = control->GetIntValue();
- var_Set( p_intf->p_vlc, control->GetName(), val );
+ var_Set( p_intf->p_libvlc, control->GetName(), val );
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, control->GetName(),
case CONFIG_ITEM_KEY:
/* So you don't need to restart to have the changes take effect */
val.i_int = control->GetIntValue();
- var_Set( p_intf->p_vlc, control->GetName().mb_str(), val );
+ var_Set( p_intf->p_libvlc, control->GetName().mb_str(), val );
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, control->GetName().mb_str(),
void Interface::SetupHotkeys()
{
- struct vlc_t::hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ struct libvlc_int_t::hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
int i_hotkeys;
/* Count number of hoteys */
vlc_value_t val;
val.i_int =
- p_intf->p_vlc->p_hotkeys[event.GetId() - i_hotkey_event].i_key;
+ p_intf->p_libvlc->p_hotkeys[event.GetId() - i_hotkey_event].i_key;
/* Get the key combination and send it to the hotkey handler */
- var_Set( p_intf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
return;
}
switch( p_sys->i_command )
{
case COMMAND_QUIT:
- b_eof = p_demux->p_vlc->b_die = VLC_TRUE;
+ b_eof = p_demux->p_libvlc->b_die = VLC_TRUE;
break;
case COMMAND_PAUSE:
char *psz_path;
if( asprintf( &psz_path, "%s/"CONFIG_DIR"/ssl/certs",
- p_tls->p_vlc->psz_homedir ) != -1 )
+ p_tls->p_libvlc->psz_homedir ) != -1 )
{
gnutls_Addx509Directory( (vlc_object_t *)p_session,
p_sys->x509_cred, psz_path, VLC_FALSE );
char *psz_path;
if( asprintf( &psz_path, "%s/"CONFIG_DIR"/ssl/private",
- p_tls->p_vlc->psz_homedir ) == -1 )
+ p_tls->p_libvlc->psz_homedir ) == -1 )
{
gnutls_certificate_free_credentials( p_sys->x509_cred );
goto error;
vlc_value_t lock, count;
- var_Create( p_this->p_libvlc, "gnutls_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "gnutls_mutex", &lock );
+ var_Create( p_this->p_libvlc_global, "gnutls_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "gnutls_mutex", &lock );
vlc_mutex_lock( lock.p_address );
/* Initialize GnuTLS only once */
- var_Create( p_this->p_libvlc, "gnutls_count", VLC_VAR_INTEGER );
- var_Get( p_this->p_libvlc, "gnutls_count", &count);
+ var_Create( p_this->p_libvlc_global, "gnutls_count", VLC_VAR_INTEGER );
+ var_Get( p_this->p_libvlc_global, "gnutls_count", &count);
if( count.i_int == 0)
{
#ifdef NEED_THREAD_CONTEXT
- __p_gcry_data = VLC_OBJECT( p_this->p_vlc );
+ __p_gcry_data = VLC_OBJECT( p_this->p_libvlc );
#endif
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_vlc);
}
count.i_int++;
- var_Set( p_this->p_libvlc, "gnutls_count", count);
+ var_Set( p_this->p_libvlc_global, "gnutls_count", count);
vlc_mutex_unlock( lock.p_address );
p_tls->pf_server_create = gnutls_ServerCreate;
vlc_value_t lock, count;
- var_Create( p_this->p_libvlc, "gnutls_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "gnutls_mutex", &lock );
+ var_Create( p_this->p_libvlc_global, "gnutls_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "gnutls_mutex", &lock );
vlc_mutex_lock( lock.p_address );
- var_Create( p_this->p_libvlc, "gnutls_count", VLC_VAR_INTEGER );
- var_Get( p_this->p_libvlc, "gnutls_count", &count);
+ var_Create( p_this->p_libvlc_global, "gnutls_count", VLC_VAR_INTEGER );
+ var_Get( p_this->p_libvlc_global, "gnutls_count", &count);
count.i_int--;
- var_Set( p_this->p_libvlc, "gnutls_count", count);
+ var_Set( p_this->p_libvlc_global, "gnutls_count", count);
if( count.i_int == 0 )
{
vlc_value_t lockval;
/* FIXME: put this in the module (de)initialization ASAP */
- var_Create( p_this->p_libvlc, "gtk", VLC_VAR_MUTEX );
+ var_Create( p_this->p_libvlc_global, "gtk", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "gtk", &lockval );
+ var_Get( p_this->p_libvlc_global, "gtk", &lockval );
vlc_mutex_lock( lockval.p_address );
if( i_refcount > 0 )
vlc_object_destroy( p_gtk_main );
i_refcount--;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
+ var_Destroy( p_this->p_libvlc_global, "gtk" );
return VLC_ETHREAD;
}
{
vlc_value_t lockval;
- var_Get( p_this->p_libvlc, "gtk", &lockval );
+ var_Get( p_this->p_libvlc_global, "gtk", &lockval );
vlc_mutex_lock( lockval.p_address );
i_refcount--;
if( i_refcount > 0 )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
+ var_Destroy( p_this->p_libvlc_global, "gtk" );
return;
}
p_gtk_main = NULL;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "gtk" );
+ var_Destroy( p_this->p_libvlc_global, "gtk" );
}
static gint foo( gpointer bar ) { return TRUE; }
#endif
#if defined(MODULE_NAME_IS_gnome_main)
- gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args );
+ gnome_init( p_this->p_libvlc->psz_object_name, VERSION, i_args, p_args );
#elif defined(MODULE_NAME_IS_gnome2_main)
gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE,
i_args, p_args,
if( !psz_file )
{
#ifdef __APPLE__
- char *psz_homedir = p_this->p_vlc->psz_homedir;
+ char *psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
static int Activate ( vlc_object_t *p_this )
{
#ifdef MODULE_NAME_IS_memcpy
- p_this->p_vlc->pf_memcpy = memcpy;
- p_this->p_vlc->pf_memset = memset;
+ p_this->p_libvlc->pf_memcpy = memcpy;
+ p_this->p_libvlc->pf_memset = memset;
#else
- p_this->p_vlc->pf_memcpy = fast_memcpy;
- p_this->p_vlc->pf_memset = NULL;
+ p_this->p_libvlc->pf_memcpy = fast_memcpy;
+ p_this->p_libvlc->pf_memset = NULL;
#endif
return VLC_SUCCESS;
*****************************************************************************/
static int Activate ( vlc_object_t *p_this )
{
- p_this->p_vlc->pf_memcpy = fast_memcpy;
+ p_this->p_libvlc->pf_memcpy = fast_memcpy;
return VLC_SUCCESS;
}
vlc_value_t lockval;
/* FIXME: put this in the module (de)initialization ASAP */
- var_Create( p_this->p_libvlc, "qte", VLC_VAR_MUTEX );
+ var_Create( p_this->p_libvlc_global, "qte", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "qte", &lockval );
+ var_Get( p_this->p_libvlc_global, "qte", &lockval );
vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
if( i_refcount > 0 )
vlc_object_destroy( p_qte_main );
i_refcount--;
vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc, "qte" );
+ var_Destroy( p_this->p_libvlc_global, "qte" );
return VLC_ETHREAD;
}
{
vlc_value_t lockval;
- var_Get( p_this->p_libvlc, "qte", &lockval );
+ var_Get( p_this->p_libvlc_global, "qte", &lockval );
vlc_mutex_lock( (vlc_mutex_t *) lockval.p_address );
i_refcount--;
if( i_refcount > 0 )
{
vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc, "qte" );
+ var_Destroy( p_this->p_libvlc_global, "qte" );
return;
}
p_qte_main->p_qte_application->quit();
p_qte_main = NULL;
vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address );
- var_Destroy( p_this->p_libvlc, "qte" );
+ var_Destroy( p_this->p_libvlc_global, "qte" );
}
/*****************************************************************************
if( p_sys->b_error == VLC_FALSE )
{
- p_this->p_vlc->b_die = VLC_TRUE;
+ p_this->p_libvlc->b_die = VLC_TRUE;
}
else
{
*****************************************************************************/
vlc_module_begin();
set_description( _("Miscellaneous stress tests") );
- var_Create( p_module->p_libvlc, "foo-test",
+ var_Create( p_module->p_libvlc_global, "foo-test",
VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_module->p_libvlc, "foo-test", Foo, NULL );
- var_Create( p_module->p_libvlc, "callback-test",
+ var_AddCallback( p_module->p_libvlc_global, "foo-test", Foo, NULL );
+ var_Create( p_module->p_libvlc_global, "callback-test",
VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_module->p_libvlc, "callback-test", Callback, NULL );
- var_Create( p_module->p_libvlc, "stress-test",
+ var_AddCallback( p_module->p_libvlc_global, "callback-test", Callback, NULL );
+ var_Create( p_module->p_libvlc_global, "stress-test",
VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_module->p_libvlc, "stress-test", Stress, NULL );
- var_Create( p_module->p_libvlc, "signal",
+ var_AddCallback( p_module->p_libvlc_global, "stress-test", Stress, NULL );
+ var_Create( p_module->p_libvlc_global, "signal",
VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- var_AddCallback( p_module->p_libvlc, "signal", Signal, NULL );
+ var_AddCallback( p_module->p_libvlc_global, "signal", Signal, NULL );
vlc_module_end();
/*****************************************************************************
p_pes->i_length = 0;
if( i_pes_payload > 0 )
{
- p_sout->p_vlc->pf_memcpy( p_pes->p_buffer + i_pes_header,
+ p_sout->p_libvlc->pf_memcpy( p_pes->p_buffer + i_pes_header,
p_data, i_pes_payload );
}
i_pes_count++;
else if( i_size > STD_PES_PAYLOAD )
{
block_t *p_new = block_New( p_mux, STD_PES_PAYLOAD );
- p_mux->p_vlc->pf_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
+ p_mux->p_libvlc->pf_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
p_new->i_pts = p_data->i_pts;
p_new->i_dts = p_data->i_dts;
p_new->i_length = p_data->i_length * STD_PES_PAYLOAD
}
i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer );
- p_mux->p_vlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer,
+ p_mux->p_libvlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer,
i_copy );
p_next->i_pts += p_next->i_length * i_copy / p_next->i_buffer;
p_next->i_dts += p_next->i_length * i_copy / p_next->i_buffer;
p_sys->p_db->pp_hosts = NULL;
p_sys->p_db->i_hosts = 0;
- var_Create( p_sd->p_vlc, "daap-db", VLC_VAR_ADDRESS );
+ var_Create( p_sd->p_libvlc, "daap-db", VLC_VAR_ADDRESS );
val.p_address = p_sys->p_db;
- var_Set( p_sd->p_vlc, "daap-db", val );
+ var_Set( p_sd->p_libvlc, "daap-db", val );
vlc_mutex_init( p_sd, &p_sys->p_db->search_lock );
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
- i_ret = var_Get( p_access->p_vlc , "daap-db", &val );
+ i_ret = var_Get( p_access->p_libvlc , "daap-db", &val );
p_sys->p_db = val.p_address;
if( p_sys->p_db == NULL || i_ret )
FreeHost( p_sd, p_sys->p_db->pp_hosts[i] );
}
- var_Destroy( p_sd->p_vlc, "daap-db" );
+ var_Destroy( p_sd->p_libvlc, "daap-db" );
if( p_playlist )
{
ID_OFFSET_LONGTEXT, VLC_FALSE );
set_callbacks( OpenIn, CloseIn );
- var_Create( p_module->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "bridge-lock", VLC_VAR_MUTEX );
vlc_module_end();
#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
static bridge_t *__GetBridge( vlc_object_t *p_object )
{
- libvlc_t *p_libvlc = p_object->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_object->p_libvlc_global;
bridge_t *p_bridge;
vlc_value_t val;
- if( var_Get( p_libvlc, "bridge-struct", &val ) != VLC_SUCCESS )
+ if( var_Get( p_libvlc_global, "bridge-struct", &val ) != VLC_SUCCESS )
{
p_bridge = NULL;
}
p_sys = malloc( sizeof( out_sout_stream_sys_t ) );
p_sys->b_inited = VLC_FALSE;
- var_Get( p_this->p_libvlc, "bridge-lock", &val );
+ var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX_OUT "id", &val );
p_bridge = GetBridge( p_stream );
if ( p_bridge == NULL )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
- var_Create( p_libvlc, "bridge-struct", VLC_VAR_ADDRESS );
+ var_Create( p_libvlc_global, "bridge-struct", VLC_VAR_ADDRESS );
val.p_address = p_bridge;
- var_Set( p_libvlc, "bridge-struct", val );
+ var_Set( p_libvlc_global, "bridge-struct", val );
p_bridge->i_es_num = 0;
p_bridge->pp_es = NULL;
sout_CfgParse( p_stream, SOUT_CFG_PREFIX_IN, ppsz_sout_options_in,
p_stream->p_cfg );
- var_Get( p_this->p_libvlc, "bridge-lock", &val );
+ var_Get( p_this->p_libvlc_global, "bridge-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX_IN "id-offset", &val );
if( b_no_es )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
free( p_bridge );
- var_Destroy( p_libvlc, "bridge-struct" );
+ var_Destroy( p_libvlc_global, "bridge-struct" );
}
vlc_mutex_unlock( p_sys->p_lock );
set_callbacks( Open, Close );
- var_Create( p_module->p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
vlc_module_end();
static const char *ppsz_sout_options[] = {
{
sout_stream_t *p_stream = (sout_stream_t *)p_this;
sout_stream_sys_t *p_sys;
- libvlc_t *p_libvlc = p_this->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_this->p_libvlc_global;
vlc_value_t val;
sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_sys = p_sys;
p_sys->b_inited = VLC_FALSE;
- var_Get( p_libvlc, "mosaic-lock", &val );
+ var_Get( p_libvlc_global, "mosaic-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX "id", &val );
p_bridge = GetBridge( p_stream );
if ( p_bridge == NULL )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
- var_Create( p_libvlc, "mosaic-struct", VLC_VAR_ADDRESS );
+ var_Create( p_libvlc_global, "mosaic-struct", VLC_VAR_ADDRESS );
val.p_address = p_bridge;
- var_Set( p_libvlc, "mosaic-struct", val );
+ var_Set( p_libvlc_global, "mosaic-struct", val );
p_bridge->i_es_num = 0;
p_bridge->pp_es = NULL;
if ( b_last_es )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_stream->p_libvlc_global;
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
free( p_bridge );
- var_Destroy( p_libvlc, "mosaic-struct" );
+ var_Destroy( p_libvlc_global, "mosaic-struct" );
}
vlc_mutex_unlock( p_sys->p_lock );
/* Set CPU capabilities */
id->ff_enc_c->dsp_mask = 0;
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMX;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
/* Set CPU capabilities */
id->ff_enc_c->dsp_mask = 0;
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMX;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
id->ff_enc_c->dsp_mask |= FF_MM_MMXEXT;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
{
id->ff_enc_c->dsp_mask |= FF_MM_3DNOW;
}
- if( !(p_stream->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ if( !(p_stream->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
{
id->ff_enc_c->dsp_mask |= FF_MM_SSE;
id->ff_enc_c->dsp_mask |= FF_MM_SSE2;
= id->ff_enc_c->coded_frame->motion_subsample_log2;
id->p_frame->mb_type = malloc( ((mb_width + 1) * (mb_height + 1) + 1)
* sizeof(uint32_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->mb_type,
+ p_stream->p_libvlc->pf_memcpy( id->p_frame->mb_type,
id->ff_enc_c->coded_frame->mb_type,
(mb_width + 1) * mb_height
* sizeof(id->p_frame->mb_type[0]));
{
id->p_frame->motion_val[i] = malloc( 2 * stride * height
* sizeof(int16_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->motion_val[i],
+ p_stream->p_libvlc->pf_memcpy( id->p_frame->motion_val[i],
id->ff_enc_c->coded_frame->motion_val[i],
2 * stride * height * sizeof(int16_t) );
}
{
id->p_frame->ref_index[i] = malloc( b8_stride * 2 * mb_height
* sizeof(int8_t) );
- p_stream->p_vlc->pf_memcpy( id->p_frame->ref_index[i],
+ p_stream->p_libvlc->pf_memcpy( id->p_frame->ref_index[i],
id->ff_enc_c->coded_frame->ref_index[i],
b8_stride * 2 * mb_height * sizeof(int8_t));
}
#endif
p_out = block_New( p_stream, i_out );
- p_stream->p_vlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
+ p_stream->p_libvlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;
return NULL;
p_out = block_New( p_stream, i_out );
- p_stream->p_vlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
+ p_stream->p_libvlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;
while( (i_scale_count -= p_vout->render.i_height) > 0 ) \
{ \
/* Height increment: copy previous picture line */ \
- p_vout->p_vlc->pf_memcpy( p_pic, p_pic_start, \
+ p_vout->p_libvlc->pf_memcpy( p_pic, p_pic_start, \
p_vout->output.i_width * BPP ); \
p_pic = (void*)((uint8_t*)p_pic + p_dest->p->i_pitch ); \
} \
int i_x;
/* Copy the Y part */
- p_vout->p_vlc->pf_memcpy( p_dest->Y_PIXELS, p_source->Y_PIXELS,
+ p_vout->p_libvlc->pf_memcpy( p_dest->Y_PIXELS, p_source->Y_PIXELS,
p_dest->p[Y_PLANE].i_pitch * p_dest->p[Y_PLANE].i_visible_lines );
/* Copy the U:V part */
if( i_in_pitch == i_copy_pitch
&& i_out_pitch == i_copy_pitch )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in, i_in_pitch
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch
* p_outpic->p[i_plane].i_visible_lines );
}
else
while( p_in < p_in_end )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
p_in += i_in_pitch;
p_out += i_out_pitch;
}
while( p_out < p_out_end )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
p_in += i_in_pitch;
p_out += i_out_pitch;
}
vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock );
#if defined(CAN_COMPILE_C_ALTIVEC)
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_ALTIVEC )
{
p_vout->p_sys->pf_merge = MergeAltivec;
p_vout->p_sys->pf_end_merge = NULL;
else
#endif
#if defined(CAN_COMPILE_SSE)
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2 )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2 )
{
p_vout->p_sys->pf_merge = MergeSSE2;
p_vout->p_sys->pf_end_merge = EndMMX;
else
#endif
#if defined(CAN_COMPILE_MMXEXT)
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
{
p_vout->p_sys->pf_merge = MergeMMXEXT;
p_vout->p_sys->pf_end_merge = EndMMX;
else
#endif
#if defined(CAN_COMPILE_3DNOW)
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW )
{
p_vout->p_sys->pf_merge = Merge3DNow;
p_vout->p_sys->pf_end_merge = End3DNow;
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
{
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
p_in += i_increment;
{
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
p_in += i_increment;
/* For BOTTOM field we need to add the first line */
if( i_field == 1 )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_in += 2 * p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
}
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
/* For TOP field we need to add the last line */
{
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
}
break;
/* For BOTTOM field we need to add the first line */
if( i_field == 1 )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
{
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_in += 2 * p_pic->p[i_plane].i_pitch;
{
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
}
}
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
/* For TOP field we need to add the last line */
{
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
}
break;
/* For BOTTOM field we need to add the first line */
if( i_field == 1 )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
for( ; p_out < p_out_end ; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
}
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
/* For TOP field we need to add the last line */
{
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
}
}
case VLC_FOURCC('I','Y','U','V'):
case VLC_FOURCC('Y','V','1','2'):
/* First line: simple copy */
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
case VLC_FOURCC('I','4','2','2'):
/* First line: simple copy */
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
uint8_t *src = &p_pic->p[i_plane].p_pixels[8*y*i_src];
#ifdef CAN_COMPILE_MMXEXT
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
XDeintBand8x8MMXEXT( dst, i_dst, src, i_src, i_mbx, i_modx );
else
#endif
}
#ifdef CAN_COMPILE_MMXEXT
- if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+ if( p_vout->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
emms();
#endif
}
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_vlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
+ p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_vlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
+ p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
else
{
- p_filter->p_vlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
+ p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_vlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
+ p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_vlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
+ p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_vlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
+ p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
else
{
- p_filter->p_vlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff,
+ p_filter->p_libvlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
- p_filter->p_vlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
+ p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) );
- p_filter->p_vlc->pf_memcpy(
+ p_filter->p_libvlc->pf_memcpy(
p_outpic->p[Y_PLANE].p_pixels, p_inpic->p[Y_PLANE].p_pixels,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
- p_filter->p_vlc->pf_memcpy(
+ p_filter->p_libvlc->pf_memcpy(
p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_vlc->pf_memcpy(
+ p_filter->p_libvlc->pf_memcpy(
p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
/* Hook used for callback variables */
p_logo_list->psz_filename =
- var_CreateGetString( p_filter->p_libvlc , "logo-file" );
+ var_CreateGetString( p_filter->p_libvlc_global , "logo-file" );
if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
{
msg_Err( p_this, "logo file not specified" );
return VLC_EGENERIC;
}
- p_sys->posx = var_CreateGetInteger( p_filter->p_libvlc , "logo-x" );
- p_sys->posy = var_CreateGetInteger( p_filter->p_libvlc , "logo-y" );
- p_sys->pos = var_CreateGetInteger( p_filter->p_libvlc , "logo-position" );
+ p_sys->posx = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-x" );
+ p_sys->posy = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-y" );
+ p_sys->pos = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-position" );
p_logo_list->i_alpha = __MAX( __MIN( var_CreateGetInteger(
- p_filter->p_libvlc, "logo-transparency"), 255 ), 0 );
+ p_filter->p_libvlc_global, "logo-transparency"), 255 ), 0 );
p_logo_list->i_delay =
- var_CreateGetInteger( p_filter->p_libvlc , "logo-delay" );
+ var_CreateGetInteger( p_filter->p_libvlc_global , "logo-delay" );
p_logo_list->i_repeat =
- var_CreateGetInteger( p_filter->p_libvlc , "logo-repeat" );
+ var_CreateGetInteger( p_filter->p_libvlc_global , "logo-repeat" );
- var_AddCallback( p_filter->p_libvlc, "logo-file", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-x", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-y", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-position", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-transparency", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-repeat", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-file", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-x", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-y", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-position", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-transparency", LogoCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "logo-repeat", LogoCallback, p_sys );
vlc_mutex_init( p_filter, &p_logo_list->lock );
vlc_mutex_lock( &p_logo_list->lock );
free( p_sys );
/* Delete the logo variables from INPUT */
- var_Destroy( p_filter->p_libvlc , "logo-file" );
- var_Destroy( p_filter->p_libvlc , "logo-x" );
- var_Destroy( p_filter->p_libvlc , "logo-y" );
- var_Destroy( p_filter->p_libvlc , "logo-delay" );
- var_Destroy( p_filter->p_libvlc , "logo-repeat" );
- var_Destroy( p_filter->p_libvlc , "logo-position" );
- var_Destroy( p_filter->p_libvlc , "logo-transparency" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-file" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-x" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-y" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-delay" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-repeat" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-position" );
+ var_Destroy( p_filter->p_libvlc_global , "logo-transparency" );
}
/*****************************************************************************
p_sys->p_style = malloc( sizeof( text_style_t ) );
memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ) );
- p_sys->i_xoff = var_CreateGetInteger( p_filter->p_libvlc , "marq-x" );
- p_sys->i_yoff = var_CreateGetInteger( p_filter->p_libvlc , "marq-y" );
- p_sys->i_timeout = var_CreateGetInteger( p_filter->p_libvlc , "marq-timeout" );
- p_sys->i_pos = var_CreateGetInteger( p_filter->p_libvlc , "marq-position" );
- p_sys->psz_marquee = var_CreateGetString( p_filter->p_libvlc, "marq-marquee" );
- p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter->p_libvlc , "marq-opacity" );
- p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter->p_libvlc , "marq-color" );
- p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter->p_libvlc , "marq-size" );
-
- var_AddCallback( p_filter->p_libvlc, "marq-x", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-y", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-marquee", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-timeout", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-position", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-color", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-opacity", MarqueeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "marq-size", MarqueeCallback, p_sys );
+ p_sys->i_xoff = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-x" );
+ p_sys->i_yoff = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-y" );
+ p_sys->i_timeout = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-timeout" );
+ p_sys->i_pos = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-position" );
+ p_sys->psz_marquee = var_CreateGetString( p_filter->p_libvlc_global, "marq-marquee" );
+ p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter->p_libvlc_global , "marq-opacity" );
+ p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-color" );
+ p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter->p_libvlc_global , "marq-size" );
+
+ var_AddCallback( p_filter->p_libvlc_global, "marq-x", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-y", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-marquee", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-timeout", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-position", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-color", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-opacity", MarqueeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "marq-size", MarqueeCallback, p_sys );
/* Misc init */
p_filter->pf_sub_filter = Filter;
free( p_sys );
/* Delete the marquee variables */
- var_DelCallback( p_filter->p_libvlc, "marq-x", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-y", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-marquee", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-timeout", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-position", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-color", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-opacity", MarqueeCallback, p_sys );
- var_DelCallback( p_filter->p_libvlc, "marq-size", MarqueeCallback, p_sys );
-
- var_Destroy( p_filter->p_libvlc , "marq-marquee" );
- var_Destroy( p_filter->p_libvlc , "marq-x" );
- var_Destroy( p_filter->p_libvlc , "marq-y" );
- var_Destroy( p_filter->p_libvlc , "marq-timeout" );
- var_Destroy( p_filter->p_libvlc , "marq-position" );
- var_Destroy( p_filter->p_libvlc , "marq-color");
- var_Destroy( p_filter->p_libvlc , "marq-opacity");
- var_Destroy( p_filter->p_libvlc , "marq-size");
+ var_DelCallback( p_filter->p_libvlc_global, "marq-x", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-y", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-marquee", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-timeout", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-position", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-color", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-opacity", MarqueeCallback, p_sys );
+ var_DelCallback( p_filter->p_libvlc_global, "marq-size", MarqueeCallback, p_sys );
+
+ var_Destroy( p_filter->p_libvlc_global , "marq-marquee" );
+ var_Destroy( p_filter->p_libvlc_global , "marq-x" );
+ var_Destroy( p_filter->p_libvlc_global , "marq-y" );
+ var_Destroy( p_filter->p_libvlc_global , "marq-timeout" );
+ var_Destroy( p_filter->p_libvlc_global , "marq-position" );
+ var_Destroy( p_filter->p_libvlc_global , "marq-color");
+ var_Destroy( p_filter->p_libvlc_global , "marq-opacity");
+ var_Destroy( p_filter->p_libvlc_global , "marq-size");
}
/****************************************************************************
add_integer( "mosaic-bsvt", 17, NULL, BLUESCREENVTOL_TEXT,
BLUESCREENVTOL_LONGTEXT, VLC_FALSE );
- var_Create( p_module->p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
vlc_module_end();
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- libvlc_t *p_libvlc = p_filter->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_filter->p_libvlc_global;
char *psz_order;
int i_index;
vlc_value_t val;
vlc_mutex_init( p_filter, &p_sys->lock );
vlc_mutex_lock( &p_sys->lock );
- var_Get( p_libvlc, "mosaic-lock", &val );
+ var_Get( p_libvlc_global, "mosaic-lock", &val );
p_sys->p_lock = val.p_address;
#define GET_VAR( name, min, max ) \
p_sys->i_##name = __MIN( max, __MAX( min, \
var_CreateGetInteger( p_filter, "mosaic-" #name ) ) ); \
var_Destroy( p_filter, "mosaic-" #name ); \
- var_Create( p_libvlc, "mosaic-" #name, VLC_VAR_INTEGER ); \
- var_SetInteger( p_libvlc, "mosaic-" #name, p_sys->i_##name ); \
- var_AddCallback( p_libvlc, "mosaic-" #name, MosaicCallback, p_sys );
+ var_Create( p_libvlc_global, "mosaic-" #name, VLC_VAR_INTEGER ); \
+ var_SetInteger( p_libvlc_global, "mosaic-" #name, p_sys->i_##name ); \
+ var_AddCallback( p_libvlc_global, "mosaic-" #name, MosaicCallback, p_sys );
GET_VAR( width, 0, INT_MAX );
GET_VAR( height, 0, INT_MAX );
if( p_sys->i_align == 3 || p_sys->i_align == 7 )
p_sys->i_align = 5;
var_Destroy( p_filter, "mosaic-align" );
- var_Create( p_libvlc, "mosaic-align", VLC_VAR_INTEGER );
- var_SetInteger( p_libvlc, "mosaic-align", p_sys->i_align );
- var_AddCallback( p_libvlc, "mosaic-align", MosaicCallback, p_sys );
+ var_Create( p_libvlc_global, "mosaic-align", VLC_VAR_INTEGER );
+ var_SetInteger( p_libvlc_global, "mosaic-align", p_sys->i_align );
+ var_AddCallback( p_libvlc_global, "mosaic-align", MosaicCallback, p_sys );
GET_VAR( vborder, 0, INT_MAX );
GET_VAR( hborder, 0, INT_MAX );
p_sys->b_ar = var_CreateGetBool( p_filter, "mosaic-keep-aspect-ratio" );
var_Destroy( p_filter, "mosaic-keep-aspect-ratio" );
- var_Create( p_libvlc, "mosaic-keep-aspect-ratio", VLC_VAR_INTEGER );
- var_SetBool( p_libvlc, "mosaic-keep-aspect-ratio", p_sys->b_ar );
- var_AddCallback( p_libvlc, "mosaic-keep-aspect-ratio", MosaicCallback,
+ var_Create( p_libvlc_global, "mosaic-keep-aspect-ratio", VLC_VAR_INTEGER );
+ var_SetBool( p_libvlc_global, "mosaic-keep-aspect-ratio", p_sys->b_ar );
+ var_AddCallback( p_libvlc_global, "mosaic-keep-aspect-ratio", MosaicCallback,
p_sys );
p_sys->b_keep = var_CreateGetBool( p_filter, "mosaic-keep-picture" );
p_sys->ppsz_order = NULL;
psz_order = var_CreateGetString( p_filter, "mosaic-order" );
- var_Create( p_libvlc, "mosaic-order", VLC_VAR_STRING);
- var_AddCallback( p_libvlc, "mosaic-order", MosaicCallback, p_sys );
+ var_Create( p_libvlc_global, "mosaic-order", VLC_VAR_STRING);
+ var_AddCallback( p_libvlc_global, "mosaic-order", MosaicCallback, p_sys );
if( psz_order[0] != 0 )
{
GET_VAR( bsvt, 0x00, 0xff );
p_sys->b_bs = var_CreateGetBool( p_filter, "mosaic-bs" );
var_Destroy( p_filter, "mosaic-bs" );
- var_Create( p_libvlc, "mosaic-bs", VLC_VAR_INTEGER );
- var_SetBool( p_libvlc, "mosaic-bs", p_sys->b_bs );
- var_AddCallback( p_libvlc, "mosaic-bs", MosaicCallback, p_sys );
+ var_Create( p_libvlc_global, "mosaic-bs", VLC_VAR_INTEGER );
+ var_SetBool( p_libvlc_global, "mosaic-bs", p_sys->b_bs );
+ var_AddCallback( p_libvlc_global, "mosaic-bs", MosaicCallback, p_sys );
if( p_sys->b_bs && p_sys->b_keep )
{
msg_Warn( p_filter, "mosaic-keep-picture needs to be disabled for"
{
filter_t *p_filter = (filter_t*)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
- libvlc_t *p_libvlc = p_filter->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_filter->p_libvlc_global;
int i_index;
vlc_mutex_lock( &p_sys->lock );
free( p_sys->ppsz_order );
}
- var_Destroy( p_libvlc, "mosaic-alpha" );
- var_Destroy( p_libvlc, "mosaic-height" );
- var_Destroy( p_libvlc, "mosaic-align" );
- var_Destroy( p_libvlc, "mosaic-width" );
- var_Destroy( p_libvlc, "mosaic-xoffset" );
- var_Destroy( p_libvlc, "mosaic-yoffset" );
- var_Destroy( p_libvlc, "mosaic-vborder" );
- var_Destroy( p_libvlc, "mosaic-hborder" );
- var_Destroy( p_libvlc, "mosaic-position" );
- var_Destroy( p_libvlc, "mosaic-rows" );
- var_Destroy( p_libvlc, "mosaic-cols" );
- var_Destroy( p_libvlc, "mosaic-keep-aspect-ratio" );
-
- var_Destroy( p_libvlc, "mosaic-bsu" );
- var_Destroy( p_libvlc, "mosaic-bsv" );
- var_Destroy( p_libvlc, "mosaic-bsut" );
- var_Destroy( p_libvlc, "mosaic-bsvt" );
- var_Destroy( p_libvlc, "mosaic-bs" );
+ var_Destroy( p_libvlc_global, "mosaic-alpha" );
+ var_Destroy( p_libvlc_global, "mosaic-height" );
+ var_Destroy( p_libvlc_global, "mosaic-align" );
+ var_Destroy( p_libvlc_global, "mosaic-width" );
+ var_Destroy( p_libvlc_global, "mosaic-xoffset" );
+ var_Destroy( p_libvlc_global, "mosaic-yoffset" );
+ var_Destroy( p_libvlc_global, "mosaic-vborder" );
+ var_Destroy( p_libvlc_global, "mosaic-hborder" );
+ var_Destroy( p_libvlc_global, "mosaic-position" );
+ var_Destroy( p_libvlc_global, "mosaic-rows" );
+ var_Destroy( p_libvlc_global, "mosaic-cols" );
+ var_Destroy( p_libvlc_global, "mosaic-keep-aspect-ratio" );
+
+ var_Destroy( p_libvlc_global, "mosaic-bsu" );
+ var_Destroy( p_libvlc_global, "mosaic-bsv" );
+ var_Destroy( p_libvlc_global, "mosaic-bsut" );
+ var_Destroy( p_libvlc_global, "mosaic-bsvt" );
+ var_Destroy( p_libvlc_global, "mosaic-bs" );
if( p_sys->p_pic ) p_sys->p_pic->pf_release( p_sys->p_pic );
vlc_mutex_unlock( &p_sys->lock );
#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
static bridge_t *__GetBridge( vlc_object_t *p_object )
{
- libvlc_t *p_libvlc = p_object->p_libvlc;
+ libvlc_global_data_t *p_libvlc_global = p_object->p_libvlc_global;
bridge_t *p_bridge;
vlc_value_t val;
- if( var_Get( p_libvlc, "mosaic-struct", &val ) != VLC_SUCCESS )
+ if( var_Get( p_libvlc_global, "mosaic-struct", &val ) != VLC_SUCCESS )
{
p_bridge = NULL;
}
if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
{
/* There are margins, but with the same width : perfect ! */
- p_vout->p_vlc->pf_memcpy(
+ p_vout->p_libvlc->pf_memcpy(
p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
p_src->p[i].i_pitch * p_src->p[i].i_visible_lines );
}
for( i_line = p_src->p[i].i_visible_lines; i_line--; )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in,
p_src->p[i].i_visible_pitch );
p_in += p_src->p[i].i_pitch;
p_out += p_dest->p[i].i_pitch;
i_num_lines = p_inpic->p[i_index].i_visible_lines;
i_size = p_inpic->p[i_index].i_lines * p_inpic->p[i_index].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in, i_size );
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_size );
switch( i_index )
{
case Y_PLANE:
p_in = p_inpic->p[i_index].p_pixels;
p_out = p_outpic->p[i_index].p_pixels;
- p_vout->p_vlc->pf_memcpy( p_last_in, p_in, i_size );
+ p_vout->p_libvlc->pf_memcpy( p_last_in, p_in, i_size );
break;
default:
break;
//create the VIDEO_FILTER_EVENT_VARIABLE
vlc_value_t val;
- if (var_Create( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT ) != VLC_SUCCESS)
+ if (var_Create( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT ) != VLC_SUCCESS)
msg_Err( p_filter, "Could not create %s\n", VIDEO_FILTER_EVENT_VARIABLE);
val.p_address = &(p_sys->event_info);
- if (var_Set( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS)
+ if (var_Set( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS)
msg_Err( p_filter, "Could not set %s\n", VIDEO_FILTER_EVENT_VARIABLE);
//OpenCV init specific to this example
free( p_sys );
- var_Destroy( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE);
+ var_Destroy( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE);
}
/****************************************************************************
}
if (faces && (faces->total > 0)) //raise the video filter event
- var_Change( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+ var_Change( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
}
else
msg_Err( p_filter, "No cascade - is opencv-haarcascade-file valid?" );
}
/* luminance */
- p_filter->p_vlc->pf_memcpy(
+ p_filter->p_libvlc->pf_memcpy(
p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
for( i_line = 0 ; i_line < i_first_line ; i_line++ )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in,
+ p_filter->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_index].i_visible_pitch );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
{
if( i_offset < 0 )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
+ p_filter->p_libvlc->pf_memcpy( p_out, p_in - i_offset,
p_pic->p[i_index].i_visible_pitch + i_offset );
p_in -= p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out + i_offset, p_in,
+ p_filter->p_libvlc->pf_memcpy( p_out + i_offset, p_in,
p_pic->p[i_index].i_visible_pitch - i_offset );
memset( p_out, black_pixel, i_offset );
p_in -= p_pic->p[i_index].i_pitch;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in,
+ p_filter->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_index].i_visible_pitch );
p_in -= p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
return VLC_EGENERIC;
}
- swscale_fast_memcpy = p_filter->p_vlc->pf_memcpy;
+ swscale_fast_memcpy = p_filter->p_libvlc->pf_memcpy;
/* Set CPU capabilities */
p_sys->i_cpu_mask = 0;
- if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_MMX )
+ if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX )
{
p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX;
}
- if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT )
+ if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT )
{
p_sys->i_cpu_mask |= SWS_CPU_CAPS_MMX2;
}
- if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW )
+ if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW )
{
p_sys->i_cpu_mask |= SWS_CPU_CAPS_3DNOW;
}
- if( p_filter->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC )
+ if( p_filter->p_libvlc_global->i_cpu & CPU_CAPABILITY_ALTIVEC )
{
p_sys->i_cpu_mask |= SWS_CPU_CAPS_ALTIVEC;
}
memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ) );
/* Hook used for callback variables */
- p_sys->i_xoff = var_CreateGetInteger( p_filter->p_libvlc , "time-x" );
- p_sys->i_yoff = var_CreateGetInteger( p_filter->p_libvlc , "time-y" );
- p_sys->psz_format = var_CreateGetString( p_filter->p_libvlc, "time-format" );
- p_sys->i_pos = var_CreateGetInteger( p_filter->p_libvlc , "time-position" );
+ p_sys->i_xoff = var_CreateGetInteger( p_filter->p_libvlc_global , "time-x" );
+ p_sys->i_yoff = var_CreateGetInteger( p_filter->p_libvlc_global , "time-y" );
+ p_sys->psz_format = var_CreateGetString( p_filter->p_libvlc_global, "time-format" );
+ p_sys->i_pos = var_CreateGetInteger( p_filter->p_libvlc_global , "time-position" );
- p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter->p_libvlc , "time-opacity" );
- p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter->p_libvlc , "time-color" );
- p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter->p_libvlc , "time-size" );
+ p_sys->p_style->i_font_alpha = 255 - var_CreateGetInteger( p_filter->p_libvlc_global , "time-opacity" );
+ p_sys->p_style->i_font_color = var_CreateGetInteger( p_filter->p_libvlc_global , "time-color" );
+ p_sys->p_style->i_font_size = var_CreateGetInteger( p_filter->p_libvlc_global , "time-size" );
- var_AddCallback( p_filter->p_libvlc, "time-x", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-y", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-format", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-position", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-color", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-opacity", TimeCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "time-size", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-x", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-y", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-format", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-position", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-color", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-opacity", TimeCallback, p_sys );
+ var_AddCallback( p_filter->p_libvlc_global, "time-size", TimeCallback, p_sys );
/* Misc init */
p_filter->pf_sub_filter = Filter;
free( p_sys );
/* Delete the time variables */
- var_Destroy( p_filter->p_libvlc , "time-format" );
- var_Destroy( p_filter->p_libvlc , "time-x" );
- var_Destroy( p_filter->p_libvlc , "time-y" );
- var_Destroy( p_filter->p_libvlc , "time-position" );
- var_Destroy( p_filter->p_libvlc , "time-color");
- var_Destroy( p_filter->p_libvlc , "time-opacity");
- var_Destroy( p_filter->p_libvlc , "time-size");
+ var_Destroy( p_filter->p_libvlc_global , "time-format" );
+ var_Destroy( p_filter->p_libvlc_global , "time-x" );
+ var_Destroy( p_filter->p_libvlc_global , "time-y" );
+ var_Destroy( p_filter->p_libvlc_global , "time-position" );
+ var_Destroy( p_filter->p_libvlc_global , "time-color");
+ var_Destroy( p_filter->p_libvlc_global , "time-opacity");
+ var_Destroy( p_filter->p_libvlc_global , "time-size");
}
static char *FormatTime(char *tformat )
for( ; p_in < p_in_end ; )
{
p_in_end -= p_pic->p[i_index].i_pitch;
- p_vout->p_vlc->pf_memcpy( p_out, p_in_end,
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in_end,
p_pic->p[i_index].i_visible_pitch );
p_out += p_pic->p[i_index].i_pitch;
}
while( p_in < p_in_end )
{
- p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+ p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
p_in += i_in_pitch;
p_out += i_out_pitch;
}
{
if( i_offset < 0 )
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
+ p_filter->p_libvlc->pf_memcpy( p_out, p_in - i_offset,
p_pic->p[i_index].i_visible_pitch + i_offset );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out + i_offset, p_in,
+ p_filter->p_libvlc->pf_memcpy( p_out + i_offset, p_in,
p_pic->p[i_index].i_visible_pitch - i_offset );
memset( p_out, black_pixel, i_offset );
p_in += p_pic->p[i_index].i_pitch;
}
else
{
- p_filter->p_vlc->pf_memcpy( p_out, p_in,
+ p_filter->p_libvlc->pf_memcpy( p_out, p_in,
p_pic->p[i_index].i_visible_pitch );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
continue;
}
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
return VLC_SUCCESS;
val.i_int |= KEY_MODIFIER_ALT;
}
- var_Set( p_event->p_vlc, "key-pressed", val );
+ var_Set( p_event->p_libvlc, "key-pressed", val );
}
break;
val.i_int |= KEY_MODIFIER_ALT;
}
- var_Set( p_event->p_vlc, "key-pressed", val );
+ var_Set( p_event->p_libvlc, "key-pressed", val );
}
break;
switch( buf )
{
case 'q':
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
default:
case 'q':
case 'Q':
case GIIUC_Escape:
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
default:
switch( (char)buf )
{
case 'q':
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
default:
// SDL_ShowCursor( 0 );
// }
//
-// if( p_vout->p_vlc->b_die )
+// if( p_vout->p_libvlc->b_die )
// p_vout->p_sys->bRunning = FALSE;
return 0;
add_shortcut( "sdl" );
set_callbacks( Open, Close );
/* XXX: check for conflicts with the SDL audio output */
- var_Create( p_module->p_libvlc, "sdl", VLC_VAR_MUTEX );
+ var_Create( p_module->p_libvlc_global, "sdl", VLC_VAR_MUTEX );
#if defined( __i386__ ) || defined( __x86_64__ )
/* On i386, SDL is linked against svgalib */
linked_with_a_crap_library_which_uses_atexit();
char *psz_method;
#endif
- var_Get( p_this->p_libvlc, "sdl", &lockval );
+ var_Get( p_this->p_libvlc_global, "sdl", &lockval );
vlc_mutex_lock( lockval.p_address );
if( SDL_WasInit( SDL_INIT_VIDEO ) != 0 )
break;
case SDL_QUIT:
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
case SDL_KEYDOWN: /* if a key is pressed */
}
else
{
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
}
break;
case SDLK_q: /* quit */
- p_vout->p_vlc->b_die = 1;
+ p_vout->p_libvlc->b_die = 1;
break;
case SDLK_f: /* switch to fullscreen */
static void Destroy( vlc_object_t *p_this )
{
vout_thread_t *p_vout = ( vout_thread_t * )p_this;
- vlc_object_t *p_vlc;
int i_index;
vlc_object_release( p_vout->p_sys->p_input );
var_Destroy( p_this, "snapshot-height" );
var_Destroy( p_this, "snapshot-datasize" );
- p_vlc = vlc_object_find( p_this, VLC_OBJECT_ROOT, FIND_PARENT );
- if( p_vlc )
- {
- /* UnRegister the snapshot vout module at the root level */
- /* var_Destroy (p_vlc, "snapshot-id"); */
- var_Destroy( p_this->p_libvlc, "snapshot-id" );
- vlc_object_release( p_vlc );
- }
+ var_Destroy( p_this->p_libvlc_global, "snapshot-id" );
for( i_index = 0 ; i_index < p_vout->p_sys->i_size ; i_index++ )
{
i_index = p_vout->p_sys->i_index;
- p_vout->p_vlc->pf_memcpy( p_vout->p_sys->p_list[i_index]->p_data,
- p_pic->p->p_pixels,
- p_vout->p_sys->i_datasize );
+ p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_list[i_index]->p_data,
+ p_pic->p->p_pixels,
+ p_vout->p_sys->i_datasize );
i_date = snapshot_GetMovietime( p_vout );
if( keyboard_keypressed(SCANCODE_ESCAPE)
|| keyboard_keypressed(SCANCODE_Q ) )
{
- p_vout->p_vlc->b_die = VLC_TRUE;
+ p_vout->p_libvlc->b_die = VLC_TRUE;
}
return VLC_SUCCESS;
switch( msg.wParam )
{
case VK_ESCAPE:
- p_event->p_vlc->b_die = VLC_TRUE;
+ p_event->p_libvlc->b_die = VLC_TRUE;
break;
}
TranslateMessage( &msg );
{
case 'q':
case 'Q':
- p_event->p_vlc->b_die = VLC_TRUE;
+ p_event->p_libvlc->b_die = VLC_TRUE;
break;
}
break;
{
val.i_int |= KEY_MODIFIER_ALT;
}
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
}
/* Mouse click */
{
/* (if this is the last a collection of expose events...) */
#if 0
- if( p_vout->p_vlc->p_input_bank->pp_input[0] != NULL )
+ if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL )
{
- if( PAUSE_S == p_vout->p_vlc->p_input_bank->pp_input[0]
+ if( PAUSE_S == p_vout->p_libvlc->p_input_bank->pp_input[0]
->stream.control.i_status )
{
/* XVideoDisplay( p_vout )*/;
XSetWMNormalHints( p_vout->p_sys->p_display,
p_win->base_window, &xsize_hints );
XSetCommand( p_vout->p_sys->p_display, p_win->base_window,
- p_vout->p_vlc->ppsz_argv, p_vout->p_vlc->i_argc );
+ p_vout->p_libvlc->ppsz_argv, p_vout->p_libvlc->i_argc );
if( !var_GetBool( p_vout, "video-deco") )
{
{
return NULL;
}
- vlc_object_attach( *pp_aout, p_this->p_vlc );
+ vlc_object_attach( *pp_aout, p_this->p_libvlc );
}
else
{
/ p_input->input.i_rate;
aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer );
- p_aout->p_vlc->pf_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
+ p_aout->p_libvlc->pf_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
p_buffer->i_nb_bytes );
p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes;
config_PutInt( p_object, "volume", i_volume );
val.b_bool = VLC_TRUE;
- var_Set( p_object->p_vlc, "volume-change", val );
+ var_Set( p_object->p_libvlc, "volume-change", val );
if ( p_aout == NULL ) return 0;
FIND_ANYWHERE );
int i_result = 0, i_volume = 0, i_volume_step = 0;
- i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
i_volume = config_GetInt( p_object, "volume" );
i_volume += i_volume_step * i_nb_steps;
if ( i_volume > AOUT_VOLUME_MAX )
i_volume = AOUT_VOLUME_MAX;
}
config_PutInt( p_object, "volume", i_volume );
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume" ,
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume" ,
(audio_volume_t) i_volume );
if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
FIND_ANYWHERE );
int i_result = 0, i_volume = 0, i_volume_step = 0;
- i_volume_step = config_GetInt( p_object->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_object->p_libvlc, "volume-step" );
i_volume = config_GetInt( p_object, "volume" );
i_volume -= i_volume_step * i_nb_steps;
if ( i_volume < AOUT_VOLUME_MIN )
i_volume = AOUT_VOLUME_MIN;
}
config_PutInt( p_object, "volume", i_volume );
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume", (audio_volume_t) i_volume );
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume", (audio_volume_t) i_volume );
if ( pi_volume != NULL ) *pi_volume = (audio_volume_t) i_volume;
if ( p_aout == NULL ) return 0;
{
/* Mute */
i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN );
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume );
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ var_SetInteger( p_object->p_libvlc_global, "saved-volume", (int)i_volume );
if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN;
}
else
{
/* Un-mute */
- var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
- i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc,
+ var_Create( p_object->p_libvlc_global, "saved-volume", VLC_VAR_INTEGER );
+ i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc_global,
"saved-volume" );
i_result = aout_VolumeSet( p_object, i_volume );
if ( pi_volume != NULL ) *pi_volume = i_volume;
{
/* Non-S/PDIF mixer only deals with float32 or fixed32. */
p_aout->mixer.mixer.i_format
- = (p_aout->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) ?
+ = (p_aout->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU) ?
VLC_FOURCC('f','l','3','2') :
VLC_FOURCC('f','i','3','2');
aout_FormatPrepare( &p_aout->mixer.mixer );
void libvlc_audio_toggle_mute( libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
- aout_VolumeMute( p_instance->p_vlc, NULL );
+ aout_VolumeMute( p_instance->p_libvlc_int, NULL );
}
vlc_bool_t libvlc_audio_get_mute( libvlc_instance_t *p_instance,
{
return;
}
- aout_VolumeMute( p_instance->p_vlc, NULL );
+ aout_VolumeMute( p_instance->p_libvlc_int, NULL );
}
else
{
/* the aout_VolumeMute is a toggle function, so this is enough. */
- aout_VolumeMute( p_instance->p_vlc, NULL );
+ aout_VolumeMute( p_instance->p_libvlc_int, NULL );
}
}
{
audio_volume_t i_volume;
- aout_VolumeGet( p_instance->p_vlc, &i_volume );
+ aout_VolumeGet( p_instance->p_libvlc_int, &i_volume );
return i_volume*200/AOUT_VOLUME_MAX;
}
if( i_volume >= 0 && i_volume <= 200 )
{
i_volume = i_volume * AOUT_VOLUME_MAX / 200;
- aout_VolumeSet( p_instance->p_vlc, i_volume );
+ aout_VolumeSet( p_instance->p_libvlc_int, i_volume );
}
else
{
{
int i_vlc_id;
libvlc_instance_t *p_new;
- vlc_t *p_vlc;
+ libvlc_int_t *p_libvlc_int;
i_vlc_id = VLC_Create();
- p_vlc = (vlc_t* ) vlc_current_object( i_vlc_id );
+ p_libvlc_int = (libvlc_int_t* ) vlc_current_object( i_vlc_id );
- if( !p_vlc ) RAISENULL( "VLC initialization failed" );
+ if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
if( !p_new ) RAISENULL( "Out of memory" );
VLC_Init( i_vlc_id, argc, argv );
- p_new->p_vlc = p_vlc;
- p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_vlc,
+ p_new->p_libvlc_int = p_libvlc_int;
+ p_new->p_playlist = (playlist_t *)vlc_object_find( p_new->p_libvlc_int,
VLC_OBJECT_PLAYLIST, FIND_CHILD );
p_new->p_vlm = NULL;
{
if( p_instance->p_playlist )
vlc_object_release( p_instance->p_playlist );
- vlc_object_release( p_instance->p_vlc );
+ vlc_object_release( p_instance->p_libvlc_int );
VLC_CleanUp( p_instance->i_vlc_id );
VLC_Destroy( p_instance->i_vlc_id );
}
if( !p_input ) RAISENULL( "Input is NULL" );
p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_vlc,
- p_input->i_input_id );
+ p_input->p_instance->p_libvlc_int,
+ p_input->i_input_id );
if( !p_input_thread ) RAISENULL( "Input does not exist" );
return p_input_thread;
return NULL;
}
- retval->p_vlc = p_vlc;
+ retval->p_libvlc = p_vlc;
retval->vlc_object_id = p_vlc_id;
/* We can keep references on these, which should not change. Is it true ? */
vlc_object_release( (vlc_object_t* )self->p_playlist );
vlc_object_release( (vlc_object_t* )self->p_intf );
- vlc_object_release( (vlc_object_t*)self->p_vlc );
+ vlc_object_release( (vlc_object_t*)self->p_libvlc );
VLC_CleanUp( self->vlc_object_id );
VLC_Destroy( self->vlc_object_id );
}
p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_vlc,
+ p_input->p_instance->p_libvlc_int,
p_input->i_input_id );
if( !p_input_thread )
{
}
p_input_thread = (input_thread_t*)vlc_object_get(
- p_input->p_instance->p_vlc,
+ p_input->p_instance->p_libvlc_int,
p_input->i_input_id );
if( !p_input_thread )
{
libvlc_exception_t *p_e )
{
/* set as default for future vout instances */
- var_SetInteger(p_instance->p_vlc, "drawable", (int)d);
+ var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d);
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
libvlc_exception_t *p_e )
{
/* set as default for future vout instances */
- config_PutInt(p_instance->p_vlc, "width", width);
- config_PutInt(p_instance->p_vlc, "height", height);
+ config_PutInt(p_instance->p_libvlc_int, "width", width);
+ config_PutInt(p_instance->p_libvlc_int, "height", height);
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
clip = view;
/* set as default for future vout instances */
- var_SetInteger( p_instance->p_vlc, "drawable-view-top", view->top );
- var_SetInteger( p_instance->p_vlc, "drawable-view-left", view->left );
- var_SetInteger( p_instance->p_vlc, "drawable-view-bottom", view->bottom );
- var_SetInteger( p_instance->p_vlc, "drawable-view-right", view->right );
- var_SetInteger( p_instance->p_vlc, "drawable-clip-top", clip->top );
- var_SetInteger( p_instance->p_vlc, "drawable-clip-left", clip->left );
- var_SetInteger( p_instance->p_vlc, "drawable-clip-bottom", clip->bottom );
- var_SetInteger( p_instance->p_vlc, "drawable-clip-right", clip->right );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-view-top", view->top );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-view-left", view->left );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-view-bottom", view->bottom );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-view-right", view->right );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-top", clip->top );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-left", clip->left );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-bottom", clip->bottom );
+ var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-right", clip->right );
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
{
#ifdef ENABLE_VLM
if( p_instance->p_vlm ) return;
- p_instance->p_vlm = vlm_New( p_instance->p_vlc );
+ p_instance->p_vlm = vlm_New( p_instance->p_libvlc_int );
#else
p_instance->p_vlm = NULL;
#endif
else
i_delay = 0;
- if( p_input->p_libvlc->b_stats )
+ if( p_input->p_libvlc_global->b_stats )
{
vlc_mutex_lock( &p_input->counters.counters_lock );
stats_UpdateInteger( p_input, p_input->counters.p_demux_read,
/* Prepare statistics */
#define INIT_COUNTER( p, type, compute ) p_input->counters.p_##p = \
stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
- if( p_input->p_libvlc->b_stats )
+ if( p_input->p_libvlc_global->b_stats )
{
INIT_COUNTER( read_bytes, INTEGER, COUNTER );
INIT_COUNTER( read_packets, INTEGER, COUNTER );
free( psz );
return VLC_EGENERIC;
}
- if( p_input->p_libvlc->b_stats )
+ if( p_input->p_libvlc_global->b_stats )
{
INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
input_EsOutDelete( p_input->p_es_out );
#define CL_CO( c ) stats_CounterClean( p_input->counters.p_##c ); p_input->counters.p_##c = NULL;
- if( p_input->p_libvlc->b_stats )
+ if( p_input->p_libvlc_global->b_stats )
{
vlc_mutex_lock( &p_input->counters.counters_lock );
CL_CO( read_bytes );
{
p_block = p_access->pf_block( p_access );
if( pb_eof ) *pb_eof = p_access->info.b_eof;
- if( p_input && p_block && p_access->p_libvlc->b_stats )
+ if( p_input && p_block && p_access->p_libvlc_global->b_stats )
{
vlc_object_yield( p_input );
vlc_mutex_lock( &p_input->counters.counters_lock );
}
}
- if( p_intf->b_block && strncmp( p_intf->p_vlc->psz_object_name,
+ if( p_intf->b_block && strncmp( p_intf->p_libvlc->psz_object_name,
"clivlc", 6) )
{
o_pool = [[NSAutoreleasePool alloc] init];
[VLCApplication sharedApplication];
- [NSApp setVLC: p_intf->p_vlc];
+ [NSApp setVLC: p_intf->p_libvlc];
}
if( p_intf->b_block &&
( !strncmp( p_intf->p_module->psz_object_name, "macosx" , 6 ) ||
- !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
+ !strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) ) )
{
/* VLC in normal primary interface mode */
RunInterface( p_intf );
{
msleep( INTF_IDLE_SLEEP );
- if( p_intf->p_vlc->b_die )
+ if( p_intf->p_libvlc->b_die )
{
p_intf->b_die = VLC_TRUE;
#ifdef __APPLE__
- if( strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) )
+ if( strncmp( p_intf->p_libvlc->psz_object_name, "clivlc", 6 ) )
{
[NSApp stop: NULL];
}
/* Try to create the interface */
sprintf( psz_intf, "%s,none", newval.psz_string );
- p_intf = intf_Create( p_this->p_vlc, psz_intf, 0, NULL );
+ p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
free( psz_intf );
if( p_intf == NULL )
{
/*****************************************************************************
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-static libvlc_t libvlc;
-static libvlc_t * p_libvlc;
-static vlc_t * p_static_vlc;
+static libvlc_global_data_t libvlc_global;
+static libvlc_global_data_t * p_libvlc_global;
+static libvlc_int_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
void LocaleInit( vlc_object_t * );
void LocaleDeinit( void );
static void SetLanguage ( char const * );
-static int GetFilenames ( vlc_t *, int, char *[] );
-static void Help ( vlc_t *, char const *psz_help_name );
-static void Usage ( vlc_t *, char const *psz_module_name );
-static void ListModules ( vlc_t * );
+static int GetFilenames ( libvlc_int_t *, int, char *[] );
+static void Help ( libvlc_int_t *, char const *psz_help_name );
+static void Usage ( libvlc_int_t *, char const *psz_module_name );
+static void ListModules ( libvlc_int_t * );
static void Version ( void );
#ifdef WIN32
static int VerboseCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static void InitDeviceValues( vlc_t * );
+static void InitDeviceValues( libvlc_int_t * );
/*****************************************************************************
* vlc_current_object: return the current object.
* If i_object is non-zero, return the corresponding object. Otherwise,
* return the statically allocated p_vlc object.
*****************************************************************************/
-vlc_t * vlc_current_object( int i_object )
+libvlc_int_t * vlc_current_object( int i_object )
{
if( i_object )
{
- return vlc_object_get( p_libvlc, i_object );
+ return vlc_object_get( p_libvlc_global, i_object );
}
return p_static_vlc;
int VLC_Create( void )
{
int i_ret;
- vlc_t * p_vlc = NULL;
+ libvlc_int_t * p_libvlc = NULL;
vlc_value_t lockval;
/* &libvlc never changes, so we can safely call this multiple times. */
- p_libvlc = &libvlc;
+ p_libvlc_global = &libvlc_global;
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
- i_ret = vlc_threads_init( p_libvlc );
+ i_ret = vlc_threads_init( p_libvlc_global );
if( i_ret < 0 )
{
return i_ret;
/* Now that the thread system is initialized, we don't have much, but
* at least we have var_Create */
- var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( !libvlc.b_ready )
+ if( !libvlc_global.b_ready )
{
char *psz_env;
/* Guess what CPU we have */
- libvlc.i_cpu = CPUCapabilities();
+ libvlc_global.i_cpu = CPUCapabilities();
/* Find verbosity from VLC_VERBOSE environment variable */
psz_env = getenv( "VLC_VERBOSE" );
- libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
+ libvlc_global.i_verbose = psz_env ? atoi( psz_env ) : -1;
#if defined( HAVE_ISATTY ) && !defined( WIN32 )
- libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
+ libvlc_global.b_color = isatty( 2 ); /* 2 is for stderr */
#else
- libvlc.b_color = VLC_FALSE;
+ libvlc_global.b_color = VLC_FALSE;
#endif
/* Initialize message queue */
- msg_Create( p_libvlc );
+ msg_Create( p_libvlc_global );
/* Announce who we are */
- msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+ msg_Dbg( p_libvlc_global, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc_global, "libvlc was configured with %s",
+ CONFIGURE_LINE );
/* The module bank will be initialized later */
- libvlc.p_module_bank = NULL;
+ libvlc_global.p_module_bank = NULL;
- libvlc.b_ready = VLC_TRUE;
+ libvlc_global.b_ready = VLC_TRUE;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_libvlc, "libvlc" );
+ var_Destroy( p_libvlc_global, "libvlc" );
/* Allocate a vlc object */
- p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
- if( p_vlc == NULL )
+ p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
+ if( p_libvlc == NULL )
{
return VLC_EGENERIC;
}
- p_vlc->thread_id = 0;
+ p_libvlc->thread_id = 0;
- p_vlc->psz_object_name = "root";
+ p_libvlc->psz_object_name = "root";
/* Initialize mutexes */
- vlc_mutex_init( p_vlc, &p_vlc->config_lock );
+ vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
#ifdef __APPLE__
- vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
- vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
+ vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
+ vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
/* Store our newly allocated structure in the global list */
- vlc_object_attach( p_vlc, p_libvlc );
+ vlc_object_attach( p_libvlc, p_libvlc_global );
/* Store data for the non-reentrant API */
- p_static_vlc = p_vlc;
+ p_static_vlc = p_libvlc;
- return p_vlc->i_object_id;
+ return p_libvlc->i_object_id;
}
/*****************************************************************************
char * psz_control;
vlc_bool_t b_exit = VLC_FALSE;
int i_ret = VLC_EEXIT;
- vlc_t * p_vlc = vlc_current_object( i_object );
module_t *p_help_module;
playlist_t *p_playlist;
vlc_value_t val;
char * psz_language;
#endif
#endif
+ libvlc_int_t * p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
/*
* System specific initialization code
*/
- system_Init( p_vlc, &i_argc, ppsz_argv );
+ system_Init( p_libvlc, &i_argc, ppsz_argv );
/* Get the executable name (similar to the basename command) */
if( i_argc > 0 )
{
- p_vlc->psz_object_name = p_tmp = ppsz_argv[ 0 ];
+ p_libvlc->psz_object_name = p_tmp = ppsz_argv[ 0 ];
while( *p_tmp )
{
- if( *p_tmp == '/' ) p_vlc->psz_object_name = ++p_tmp;
+ if( *p_tmp == '/' ) p_libvlc->psz_object_name = ++p_tmp;
else ++p_tmp;
}
}
else
{
- p_vlc->psz_object_name = "vlc";
+ p_libvlc->psz_object_name = "vlc";
}
/*
* Global iconv, must be done after setlocale()
* so that vlc_current_charset() works.
*/
- LocaleInit( (vlc_object_t *)p_vlc );
+ LocaleInit( (vlc_object_t *)p_libvlc );
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
- msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
/* Initialize the module bank and load the configuration of the
* main module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help == main module
* options) */
- module_InitBank( p_vlc );
+ module_InitBank( p_libvlc );
/* Hack: insert the help module here */
- p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
+ p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
{
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
p_help_module->psz_longname = N_("Help options");
config_Duplicate( p_help_module, p_help_config );
- vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
/* End hack */
- if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
+ if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{
vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
/* Check for short help option */
- if( config_GetInt( p_vlc, "help" ) )
+ if( config_GetInt( p_libvlc, "help" ) )
{
- Help( p_vlc, "help" );
+ Help( p_libvlc, "help" );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for version option */
- else if( config_GetInt( p_vlc, "version" ) )
+ else if( config_GetInt( p_libvlc, "version" ) )
{
Version();
b_exit = VLC_TRUE;
}
/* Set the config file stuff */
- p_vlc->psz_homedir = config_GetHomeDir();
- p_vlc->psz_userdir = config_GetUserDir();
- if( p_vlc->psz_userdir == NULL )
- p_vlc->psz_userdir = strdup(p_vlc->psz_homedir);
- p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" );
- if( p_vlc->psz_configfile != NULL && p_vlc->psz_configfile[0] == '~'
- && p_vlc->psz_configfile[1] == '/' )
- {
- char *psz = malloc( strlen(p_vlc->psz_userdir)
- + strlen(p_vlc->psz_configfile) );
+ p_libvlc->psz_homedir = config_GetHomeDir();
+ p_libvlc->psz_userdir = config_GetUserDir();
+ if( p_libvlc->psz_userdir == NULL )
+ p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
+ p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
+ if( p_libvlc->psz_configfile != NULL && p_libvlc->psz_configfile[0] == '~'
+ && p_libvlc->psz_configfile[1] == '/' )
+ {
+ char *psz = malloc( strlen(p_libvlc->psz_userdir)
+ + strlen(p_libvlc->psz_configfile) );
/* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( psz, "%s/%s", p_vlc->psz_userdir,
- p_vlc->psz_configfile + 2 );
- free( p_vlc->psz_configfile );
- p_vlc->psz_configfile = psz;
+ sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
+ p_libvlc->psz_configfile + 2 );
+ free( p_libvlc->psz_configfile );
+ p_libvlc->psz_configfile = psz;
}
/* Check for plugins cache options */
- if( config_GetInt( p_vlc, "reset-plugins-cache" ) )
+ if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
{
- libvlc.p_module_bank->b_cache_delete = VLC_TRUE;
+ libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE;
}
/* Hack: remove the help module here */
/* End hack */
/* Will be re-done properly later on */
- p_vlc->p_libvlc->i_verbose = config_GetInt( p_vlc, "verbose" );
+ p_libvlc->p_libvlc_global->i_verbose = config_GetInt( p_libvlc, "verbose" );
/* Check for daemon mode */
#ifndef WIN32
- if( config_GetInt( p_vlc, "daemon" ) )
+ if( config_GetInt( p_libvlc, "daemon" ) )
{
#if HAVE_DAEMON
if( daemon( 1, 0) != 0 )
{
- msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = VLC_TRUE;
}
- p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+ p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
/* lets check if we need to write the pidfile */
- char * psz_pidfile = config_GetPsz( p_vlc, "pidfile" );
+ char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
- msg_Dbg( p_vlc, "psz_pidfile is %s", psz_pidfile );
+ msg_Dbg( p_libvlc, "psz_pidfile is %s", psz_pidfile );
if( psz_pidfile != NULL )
{
FILE *pidfile;
pid_t i_pid = getpid ();
- msg_Dbg( p_vlc, "our PID is %d, writing it to %s", i_pid, psz_pidfile );
+ msg_Dbg( p_libvlc, "our PID is %d, writing it to %s", i_pid, psz_pidfile );
pidfile = utf8_fopen( psz_pidfile,"w" );
if( pidfile != NULL )
}
else
{
- msg_Err( p_vlc, "Cannot open pid file for writing: %s, error: %s",
+ msg_Err( p_libvlc, "Cannot open pid file for writing: %s, error: %s",
psz_pidfile, strerror(errno) );
}
}
if( ( i_pid = fork() ) < 0 )
{
- msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = VLC_TRUE;
}
else if( i_pid )
{
/* This is the parent, exit right now */
- msg_Dbg( p_vlc, "closing parent process" );
+ msg_Dbg( p_libvlc, "closing parent process" );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
else
{
/* We are the child */
- msg_Dbg( p_vlc, "daemon spawned" );
+ msg_Dbg( p_libvlc, "daemon spawned" );
close( STDIN_FILENO );
close( STDOUT_FILENO );
close( STDERR_FILENO );
- p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+ p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
}
#endif
}
{
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_ret;
}
# if defined (WIN32) || defined (__APPLE__)
/* This ain't really nice to have to reload the config here but it seems
* the only way to do it. */
- config_LoadConfigFile( p_vlc, "main" );
- config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_LoadConfigFile( p_libvlc, "main" );
+ config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
/* Check if the user specified a custom language */
- psz_language = config_GetPsz( p_vlc, "language" );
+ psz_language = config_GetPsz( p_libvlc, "language" );
if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
{
- vlc_bool_t b_cache_delete = libvlc.p_module_bank->b_cache_delete;
+ vlc_bool_t b_cache_delete = libvlc_global.p_module_bank->b_cache_delete;
/* Reset the default domain */
SetLanguage( psz_language );
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
- msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+ msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
- module_EndBank( p_vlc );
- module_InitBank( p_vlc );
- config_LoadConfigFile( p_vlc, "main" );
- config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
- libvlc.p_module_bank->b_cache_delete = b_cache_delete;
+ module_EndBank( p_libvlc );
+ module_InitBank( p_libvlc );
+ config_LoadConfigFile( p_libvlc, "main" );
+ config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+ libvlc_global.p_module_bank->b_cache_delete = b_cache_delete;
}
if( psz_language ) free( psz_language );
# endif
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( p_vlc );
- module_LoadPlugins( p_vlc );
- if( p_vlc->b_die )
+ module_LoadBuiltins( p_libvlc );
+ module_LoadPlugins( p_libvlc );
+ if( p_libvlc->b_die )
{
b_exit = VLC_TRUE;
}
- msg_Dbg( p_vlc, "module bank initialized, found %i modules",
- libvlc.p_module_bank->i_children );
+ msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
+ libvlc_global.p_module_bank->i_children );
/* Hack: insert the help module here */
- vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
/* End hack */
/* Check for help on modules */
- if( (p_tmp = config_GetPsz( p_vlc, "module" )) )
+ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
{
- Help( p_vlc, p_tmp );
+ Help( p_libvlc, p_tmp );
free( p_tmp );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for long help option */
- else if( config_GetInt( p_vlc, "longhelp" ) )
+ else if( config_GetInt( p_libvlc, "longhelp" ) )
{
- Help( p_vlc, "longhelp" );
+ Help( p_libvlc, "longhelp" );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for module list option */
- else if( config_GetInt( p_vlc, "list" ) )
+ else if( config_GetInt( p_libvlc, "list" ) )
{
- ListModules( p_vlc );
+ ListModules( p_libvlc );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for config file options */
- if( config_GetInt( p_vlc, "reset-config" ) )
+ if( config_GetInt( p_libvlc, "reset-config" ) )
{
vlc_object_detach( p_help_module );
- config_ResetAll( p_vlc );
- config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
- config_SaveConfigFile( p_vlc, NULL );
- vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ config_ResetAll( p_libvlc );
+ config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_libvlc, NULL );
+ vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
}
- if( config_GetInt( p_vlc, "save-config" ) )
+ if( config_GetInt( p_libvlc, "save-config" ) )
{
vlc_object_detach( p_help_module );
- config_LoadConfigFile( p_vlc, NULL );
- config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
- config_SaveConfigFile( p_vlc, NULL );
- vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ config_LoadConfigFile( p_libvlc, NULL );
+ config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_libvlc, NULL );
+ vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
}
/* Hack: remove the help module here */
{
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_ret;
}
/*
* Init device values
*/
- InitDeviceValues( p_vlc );
+ InitDeviceValues( p_libvlc );
/*
* Override default configuration with config file settings
*/
- config_LoadConfigFile( p_vlc, NULL );
+ config_LoadConfigFile( p_libvlc, NULL );
/* Hack: insert the help module here */
- vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ vlc_object_attach( p_help_module, libvlc_global.p_module_bank );
/* End hack */
/*
* Override configuration with command line settings
*/
- if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_FALSE ) )
+ if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_FALSE ) )
{
#ifdef WIN32
ShowConsole( VLC_FALSE );
vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
/*
* System specific configuration
*/
- system_Configure( p_vlc, &i_argc, ppsz_argv );
+ system_Configure( p_libvlc, &i_argc, ppsz_argv );
/*
* Message queue options
*/
- var_Create( p_vlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- if( config_GetInt( p_vlc, "quiet" ) )
+ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ if( config_GetInt( p_libvlc, "quiet" ) )
{
val.i_int = -1;
- var_Set( p_vlc, "verbose", val );
+ var_Set( p_libvlc, "verbose", val );
}
- var_AddCallback( p_vlc, "verbose", VerboseCallback, NULL );
- var_Change( p_vlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+ var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
+ var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
- libvlc.b_color = libvlc.b_color && config_GetInt( p_vlc, "color" );
+ libvlc_global.b_color = libvlc_global.b_color &&
+ config_GetInt( p_libvlc, "color" );
/*
* Output messages that may still be in the queue
*/
- msg_Flush( p_vlc );
+ msg_Flush( p_libvlc );
- /* p_vlc initialization. FIXME ? */
+ /* p_libvlc initialization. FIXME ? */
- if( !config_GetInt( p_vlc, "fpu" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_FPU;
+ if( !config_GetInt( p_libvlc, "fpu" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
#if defined( __i386__ ) || defined( __x86_64__ )
- if( !config_GetInt( p_vlc, "mmx" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_MMX;
- if( !config_GetInt( p_vlc, "3dn" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_3DNOW;
- if( !config_GetInt( p_vlc, "mmxext" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
- if( !config_GetInt( p_vlc, "sse" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_SSE;
- if( !config_GetInt( p_vlc, "sse2" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_SSE2;
+ if( !config_GetInt( p_libvlc, "mmx" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX;
+ if( !config_GetInt( p_libvlc, "3dn" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW;
+ if( !config_GetInt( p_libvlc, "mmxext" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
+ if( !config_GetInt( p_libvlc, "sse" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE;
+ if( !config_GetInt( p_libvlc, "sse2" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2;
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
- if( !config_GetInt( p_vlc, "altivec" ) )
- libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+ if( !config_GetInt( p_libvlc, "altivec" ) )
+ libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( libvlc.i_cpu & capability ) \
+ if( libvlc_global.i_cpu & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
- msg_Dbg( p_vlc, "CPU has capabilities %s", p_capabilities );
+ msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
/*
* Choose the best memcpy module
*/
- p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy", 0 );
+ p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
- if( p_vlc->pf_memcpy == NULL )
+ if( p_libvlc->pf_memcpy == NULL )
{
- p_vlc->pf_memcpy = memcpy;
+ p_libvlc->pf_memcpy = memcpy;
}
- if( p_vlc->pf_memset == NULL )
+ if( p_libvlc->pf_memset == NULL )
{
- p_vlc->pf_memset = memset;
+ p_libvlc->pf_memset = memset;
}
- libvlc.b_stats = config_GetInt( p_vlc, "stats" );
- libvlc.i_timers = 0;
- libvlc.pp_timers = NULL;
- vlc_mutex_init( p_vlc, &libvlc.timer_lock );
+ libvlc_global.b_stats = config_GetInt( p_libvlc, "stats" );
+ libvlc_global.i_timers = 0;
+ libvlc_global.pp_timers = NULL;
+ vlc_mutex_init( p_libvlc, &libvlc_global.timer_lock );
/*
* Initialize hotkey handling
*/
- var_Create( p_vlc, "key-pressed", VLC_VAR_INTEGER );
- p_vlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
+ var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
+ p_libvlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
/* Do a copy (we don't need to modify the strings) */
- memcpy( p_vlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
+ memcpy( p_libvlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
/*
* Initialize playlist and get commandline files
*/
- p_playlist = playlist_ThreadCreate( p_vlc );
+ p_playlist = playlist_ThreadCreate( p_libvlc );
if( !p_playlist )
{
- msg_Err( p_vlc, "playlist initialization failed" );
- if( p_vlc->p_memcpy_module != NULL )
+ msg_Err( p_libvlc, "playlist initialization failed" );
+ if( p_libvlc->p_memcpy_module != NULL )
{
- module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
}
- module_EndBank( p_vlc );
- if( i_object ) vlc_object_release( p_vlc );
+ module_EndBank( p_libvlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
/*
* Load background interfaces
*/
- psz_modules = config_GetPsz( p_vlc, "extraintf" );
- psz_control = config_GetPsz( p_vlc, "control" );
+ psz_modules = config_GetPsz( p_libvlc, "extraintf" );
+ psz_control = config_GetPsz( p_libvlc, "control" );
if( psz_modules && *psz_modules && psz_control && *psz_control )
{
* Currently, only for X
*/
#ifdef HAVE_X11_XLIB_H
- if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 )
+ if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 )
{
VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
}
#endif
- if( config_GetInt( p_vlc, "file-logging" ) == 1 )
+ if( config_GetInt( p_libvlc, "file-logging" ) == 1 )
{
VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
}
#ifdef HAVE_SYSLOG_H
- if( config_GetInt( p_vlc, "syslog" ) == 1 )
+ if( config_GetInt( p_libvlc, "syslog" ) == 1 )
{
char *psz_logmode = "logmode=syslog";
AddIntfInternal( 0, "logger,none", VLC_FALSE, VLC_FALSE, 1, &psz_logmode );
}
#endif
- if( config_GetInt( p_vlc, "show-intf" ) == 1 )
+ if( config_GetInt( p_libvlc, "show-intf" ) == 1 )
{
VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
}
- if( config_GetInt( p_vlc, "network-synchronisation") == 1 )
+ if( config_GetInt( p_libvlc, "network-synchronisation") == 1 )
{
VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
}
/*
- * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
+ * FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
*/
- var_Create( p_vlc, "drawable", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-view-top", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-view-left", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-view-bottom", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-view-right", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-clip-top", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-clip-left", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
- var_Create( p_vlc, "drawable-clip-right", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-view-right", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-clip-top", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
/* Create volume callback system. */
- var_Create( p_vlc, "volume-change", VLC_VAR_BOOL );
+ var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
/*
* Get input filenames given as commandline arguments
*/
- GetFilenames( p_vlc, i_argc, ppsz_argv );
+ GetFilenames( p_libvlc, i_argc, ppsz_argv );
/*
* Get --open argument
*/
- var_Create( p_vlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_vlc, "open", &val );
+ var_Create( p_libvlc, "open", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_libvlc, "open", &val );
if ( val.psz_string != NULL && *val.psz_string )
{
- VLC_AddTarget( p_vlc->i_object_id, val.psz_string, NULL, 0,
+ VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0,
PLAYLIST_INSERT, 0 );
}
if ( val.psz_string != NULL ) free( val.psz_string );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
*****************************************************************************/
int VLC_Die( int i_object )
{
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_vlc->b_die = VLC_TRUE;
+ p_libvlc->b_die = VLC_TRUE;
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
vout_thread_t * p_vout;
aout_instance_t * p_aout;
announce_handler_t * p_announce;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
/*
* Ask the interfaces to stop and destroy them
*/
- msg_Dbg( p_vlc, "removing all interfaces" );
- while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
+ msg_Dbg( p_libvlc, "removing all interfaces" );
+ while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
intf_StopThread( p_intf );
vlc_object_detach( p_intf );
/*
* Free playlist
*/
- msg_Dbg( p_vlc, "removing playlist handler" );
- while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
+ msg_Dbg( p_libvlc, "removing playlist handler" );
+ while( (p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST,
FIND_CHILD )) )
{
vlc_object_detach( p_playlist );
/*
* Free video outputs
*/
- msg_Dbg( p_vlc, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+ msg_Dbg( p_libvlc, "removing all video outputs" );
+ while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
{
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
/*
* Free audio outputs
*/
- msg_Dbg( p_vlc, "removing all audio outputs" );
- while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
+ msg_Dbg( p_libvlc, "removing all audio outputs" );
+ while( (p_aout = vlc_object_find( p_libvlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
{
vlc_object_detach( (vlc_object_t *)p_aout );
vlc_object_release( (vlc_object_t *)p_aout );
aout_Delete( p_aout );
}
- stats_TimersDumpAll( p_vlc );
- stats_TimersClean( p_vlc );
+ stats_TimersDumpAll( p_libvlc );
+ stats_TimersClean( p_libvlc );
/*
* Free announce handler(s?)
*/
- while( (p_announce = vlc_object_find( p_vlc, VLC_OBJECT_ANNOUNCE,
+ while( (p_announce = vlc_object_find( p_libvlc, VLC_OBJECT_ANNOUNCE,
FIND_CHILD ) ) )
{
- msg_Dbg( p_vlc, "removing announce handler" );
+ msg_Dbg( p_libvlc, "removing announce handler" );
vlc_object_detach( p_announce );
vlc_object_release( p_announce );
announce_HandlerDestroy( p_announce );
}
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
*****************************************************************************/
int VLC_Destroy( int i_object )
{
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
/*
* Free allocated memory
*/
- if( p_vlc->p_memcpy_module )
+ if( p_libvlc->p_memcpy_module )
{
- module_Unneed( p_vlc, p_vlc->p_memcpy_module );
- p_vlc->p_memcpy_module = NULL;
+ module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
+ p_libvlc->p_memcpy_module = NULL;
}
/*
* Free module bank !
*/
- module_EndBank( p_vlc );
+ module_EndBank( p_libvlc );
- if( p_vlc->psz_homedir )
+ if( p_libvlc->psz_homedir )
{
- free( p_vlc->psz_homedir );
- p_vlc->psz_homedir = NULL;
+ free( p_libvlc->psz_homedir );
+ p_libvlc->psz_homedir = NULL;
}
- if( p_vlc->psz_userdir )
+ if( p_libvlc->psz_userdir )
{
- free( p_vlc->psz_userdir );
- p_vlc->psz_userdir = NULL;
+ free( p_libvlc->psz_userdir );
+ p_libvlc->psz_userdir = NULL;
}
- if( p_vlc->psz_configfile )
+ if( p_libvlc->psz_configfile )
{
- free( p_vlc->psz_configfile );
- p_vlc->psz_configfile = NULL;
+ free( p_libvlc->psz_configfile );
+ p_libvlc->psz_configfile = NULL;
}
- if( p_vlc->p_hotkeys )
+ if( p_libvlc->p_hotkeys )
{
- free( p_vlc->p_hotkeys );
- p_vlc->p_hotkeys = NULL;
+ free( p_libvlc->p_hotkeys );
+ p_libvlc->p_hotkeys = NULL;
}
/*
* System specific cleaning code
*/
- system_End( p_vlc );
+ system_End( p_libvlc );
/*
* Free message queue.
* Nobody shall use msg_* afterward.
*/
- msg_Flush( p_vlc );
- msg_Destroy( p_libvlc );
+ msg_Flush( p_libvlc );
+ msg_Destroy( p_libvlc_global );
/* Destroy global iconv */
LocaleDeinit();
/* Destroy mutexes */
- vlc_mutex_destroy( &p_vlc->config_lock );
+ vlc_mutex_destroy( &p_libvlc->config_lock );
- vlc_object_detach( p_vlc );
+ vlc_object_detach( p_libvlc );
/* Release object before destroying it */
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
- vlc_object_destroy( p_vlc );
+ vlc_object_destroy( p_libvlc );
/* Stop thread system: last one out please shut the door! */
- vlc_threads_end( p_libvlc );
+ vlc_threads_end( p_libvlc_global );
return VLC_SUCCESS;
}
*****************************************************************************/
int VLC_VariableSet( int i_object, char const *psz_var, vlc_value_t value )
{
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
int i_ret;
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
module_config_t *p_item;
char const *psz_newvar = psz_var + 6;
- p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
+ p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar );
if( p_item )
{
switch( p_item->i_type )
{
case CONFIG_ITEM_BOOL:
- config_PutInt( p_vlc, psz_newvar, value.b_bool );
+ config_PutInt( p_libvlc, psz_newvar, value.b_bool );
break;
case CONFIG_ITEM_INTEGER:
- config_PutInt( p_vlc, psz_newvar, value.i_int );
+ config_PutInt( p_libvlc, psz_newvar, value.i_int );
break;
case CONFIG_ITEM_FLOAT:
- config_PutFloat( p_vlc, psz_newvar, value.f_float );
+ config_PutFloat( p_libvlc, psz_newvar, value.f_float );
break;
default:
- config_PutPsz( p_vlc, psz_newvar, value.psz_string );
+ config_PutPsz( p_libvlc, psz_newvar, value.psz_string );
break;
}
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
}
- i_ret = var_Set( p_vlc, psz_var, value );
+ i_ret = var_Set( p_libvlc, psz_var, value );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_ret;
}
*****************************************************************************/
int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value )
{
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
int i_ret;
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- i_ret = var_Get( p_vlc , psz_var, p_value );
+ i_ret = var_Get( p_libvlc , psz_var, p_value );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_ret;
}
int VLC_VariableType( int i_object, char const *psz_var, int *pi_type )
{
int i_type;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
module_config_t *p_item;
char const *psz_newvar = psz_var + 6;
- p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
+ p_item = config_FindConfig( VLC_OBJECT(p_libvlc), psz_newvar );
if( p_item )
{
i_type = 0;
}
else
- i_type = VLC_VAR_TYPE & var_Type( p_vlc , psz_var );
+ i_type = VLC_VAR_TYPE & var_Type( p_libvlc , psz_var );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
if( i_type > 0 )
{
{
int i_err;
playlist_t *p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL )
{
- msg_Dbg( p_vlc, "no playlist present, creating one" );
- p_playlist = playlist_ThreadCreate( p_vlc );
+ msg_Dbg( p_libvlc, "no playlist present, creating one" );
+ p_playlist = playlist_ThreadCreate( p_libvlc );
if( p_playlist == NULL )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_err;
}
int VLC_Play( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
playlist_Play( p_playlist );
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_Pause( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
playlist_Pause( p_playlist );
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_Stop( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
playlist_t * p_playlist;
vlc_bool_t b_playing;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
}
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return b_playing;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "position", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.f_float;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "position", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.f_float;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "time", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.i_time / 1000000;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
}
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "length", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.i_time / 1000000L;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "rate", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.f_float / INPUT_RATE_DEFAULT;
}
{
input_thread_t *p_input;
vlc_value_t val;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+ p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD );
if( !p_input )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
var_Get( p_input, "rate", &val );
vlc_object_release( p_input );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return val.f_float / INPUT_RATE_DEFAULT;
}
{
int i_size;
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
i_size = p_playlist->i_size;
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_size;
}
int VLC_PlaylistNext( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
playlist_Next( p_playlist );
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_PlaylistPrev( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
playlist_Prev( p_playlist );
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_PlaylistClear( int i_object )
{
playlist_t * p_playlist;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
+ p_playlist = vlc_object_find( p_libvlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
vlc_object_release( p_playlist );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_VolumeSet( int i_object, int i_volume )
{
audio_volume_t i_vol = 0;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
if( i_volume >= 0 && i_volume <= 200 )
{
i_vol = i_volume * AOUT_VOLUME_MAX / 200;
- aout_VolumeSet( p_vlc, i_vol );
+ aout_VolumeSet( p_libvlc, i_vol );
}
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_vol * 200 / AOUT_VOLUME_MAX;
}
int VLC_VolumeGet( int i_object )
{
audio_volume_t i_volume;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- aout_VolumeGet( p_vlc, &i_volume );
+ aout_VolumeGet( p_libvlc, &i_volume );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_volume*200/AOUT_VOLUME_MAX;
}
*/
int VLC_VolumeMute( int i_object )
{
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- aout_VolumeMute( p_vlc, NULL );
+ aout_VolumeMute( p_libvlc, NULL );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
int VLC_FullScreen( int i_object )
{
vout_thread_t *p_vout;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
- p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD );
+ p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD );
if( !p_vout )
{
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_ENOOBJ;
}
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
vlc_object_release( p_vout );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
}
{
int i_err;
intf_thread_t *p_intf;
- vlc_t *p_vlc = vlc_current_object( i_object );
+ libvlc_int_t *p_libvlc = vlc_current_object( i_object );
- if( !p_vlc )
+ if( !p_libvlc )
{
return VLC_ENOOBJ;
}
#ifndef WIN32
- if( p_vlc->p_libvlc->b_daemon && b_block && !psz_module )
+ if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
{
/* Daemon mode hack.
* We prefer the dummy interface if none is specified. */
- char *psz_interface = config_GetPsz( p_vlc, "intf" );
+ char *psz_interface = config_GetPsz( p_libvlc, "intf" );
if( !psz_interface || !*psz_interface ) psz_module = "dummy";
if( psz_interface ) free( psz_interface );
}
#endif
/* Try to create the interface */
- p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf",
+ p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
i_options, ppsz_options );
if( p_intf == NULL )
{
- msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module );
- if( i_object ) vlc_object_release( p_vlc );
+ msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_EGENERIC;
}
{
vlc_object_detach( p_intf );
intf_Destroy( p_intf );
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return i_err;
}
- if( i_object ) vlc_object_release( p_vlc );
+ if( i_object ) vlc_object_release( p_libvlc );
return VLC_SUCCESS;
};
#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS )
psz_path = LOCALEDIR;
#else
- snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
+ snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath,
"locale" );
psz_path = psz_tmp;
#endif
* Parse command line for input files as well as their associated options.
* An option always follows its associated input and begins with a ":".
*****************************************************************************/
-static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] )
{
int i_opt, i_options;
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static void Help( vlc_t *p_this, char const *psz_help_name )
+static void Help( libvlc_int_t *p_this, char const *psz_help_name )
{
#ifdef WIN32
ShowConsole( VLC_TRUE );
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static void Usage( vlc_t *p_this, char const *psz_module_name )
+static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
{
#define FORMAT_STRING " %s --%s%s%s%s%s%s%s "
/* short option ------' | | | | | | |
* Print a list of all available modules (builtins and plugins) and a short
* description for each one.
*****************************************************************************/
-static void ListModules( vlc_t *p_this )
+static void ListModules( libvlc_int_t *p_this )
{
vlc_list_t *p_list;
module_t *p_parser;
static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param)
{
- vlc_t *p_vlc = (vlc_t *)p_this;
+ libvlc_int_t *p_vlc = (libvlc_int_t *)p_this;
if( new_val.i_int >= -1 )
{
- p_vlc->p_libvlc->i_verbose = __MIN( new_val.i_int, 2 );
+ p_vlc->p_libvlc_global->i_verbose = __MIN( new_val.i_int, 2 );
}
return VLC_SUCCESS;
}
*****************************************************************************
* This function inits the dvd, vcd and cd-audio values
*****************************************************************************/
-static void InitDeviceValues( vlc_t *p_vlc )
+static void InitDeviceValues( libvlc_int_t *p_vlc )
{
#ifdef HAVE_HAL
LibHalContext * ctx;
*****************************************************************************/
void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
{
- p_this->p_libvlc->p_appthread =
+ p_this->p_libvlc_global->p_appthread =
(vlc_object_t *)vlc_object_create( p_this, sizeof(vlc_object_t) );
/* Create the BApplication thread and wait for initialization */
- vlc_thread_create( p_this->p_libvlc->p_appthread, "app thread", AppThread,
+ vlc_thread_create( p_this->p_libvlc_global->p_appthread, "app thread", AppThread,
VLC_THREAD_PRIORITY_LOW, VLC_TRUE );
}
/* Tell the BApplication to die */
be_app->PostMessage( REALLY_QUIT );
- vlc_thread_join( p_this->p_libvlc->p_appthread );
- vlc_object_destroy( p_this->p_libvlc->p_appthread );
+ vlc_thread_join( p_this->p_libvlc_global->p_appthread );
+ vlc_object_destroy( p_this->p_libvlc_global->p_appthread );
- free( p_this->p_libvlc->psz_vlcpath );
+ free( p_this->p_libvlc_global->psz_vlcpath );
}
/* following functions are local */
{
VlcApplication * BeApp =
new VlcApplication("application/x-vnd.videolan-vlc");
- vlc_object_attach( p_this, p_this->p_vlc );
+ vlc_object_attach( p_this, p_this->p_libvlc );
BeApp->p_this = p_this;
BeApp->Run();
vlc_object_detach( p_this );
BEntry entry( &info.ref );
entry.GetPath( &path );
path.GetParent( &path );
- p_this->p_libvlc->psz_vlcpath = strdup( path.Path() );
+ p_this->p_libvlc_global->psz_vlcpath = strdup( path.Path() );
/* Tell the main thread we are finished initializing the BApplication */
vlc_thread_ready( p_this );
{
if( !fReadyToQuit )
{
- p_this->p_vlc->b_die = 1;
+ p_this->p_libvlc->b_die = 1;
return false;
}
p_block->pf_release = BlockRelease;
/* Is ok, as no comunication between p_vlc */
- p_block->p_manager = VLC_OBJECT( p_obj->p_vlc );
+ p_block->p_manager = VLC_OBJECT( p_obj->p_libvlc );
p_block->p_sys = p_sys;
return p_block;
char *__vlc_fix_readdir_charset( vlc_object_t *p_this, const char *psz_string )
{
#ifdef __APPLE__
- if ( p_this->p_libvlc->iconv_macosx != (vlc_iconv_t)-1 )
+ if ( p_this->p_libvlc_global->iconv_macosx != (vlc_iconv_t)-1 )
{
const char *psz_in = psz_string;
size_t i_in = strlen(psz_in);
char *psz_utf8 = malloc(i_out + 1);
char *psz_out = psz_utf8;
- vlc_mutex_lock( &p_this->p_libvlc->iconv_lock );
- size_t i_ret = vlc_iconv( p_this->p_libvlc->iconv_macosx,
+ vlc_mutex_lock( &p_this->p_libvlc_global->iconv_lock );
+ size_t i_ret = vlc_iconv( p_this->p_libvlc_global->iconv_macosx,
&psz_in, &i_in, &psz_out, &i_out );
- vlc_mutex_unlock( &p_this->p_libvlc->iconv_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc_global->iconv_lock );
if( i_ret == (size_t)-1 || i_in )
{
msg_Warn( p_this,
module_t *p_module;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
}
/*****************************************************************************
char *psz_filename, *psz_homedir, *psz_configfile;
int i_index;
- psz_configfile = p_this->p_vlc->psz_configfile;
+ psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
msg_Dbg( p_this, "opening config file %s", psz_filename );
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
file = utf8_fopen( psz_filename, "rt" );
if( !file )
{
msg_Warn( p_this, "config file %s does not exist yet", psz_filename );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return 0;
}
int i_index;
/* Acquire config file lock */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
- psz_configfile = p_this->p_vlc->psz_configfile;
+ psz_configfile = p_this->p_libvlc->psz_configfile;
if( !psz_configfile || !psz_configfile )
{
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
psz_filename = (char *)malloc( sizeof("/" CONFIG_DIR "/" CONFIG_FILE) +
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
if( !psz_filename )
{
msg_Err( p_this, "out of memory" );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
}
msg_Err( p_this, "out of memory" );
if( file ) fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
p_bigbuffer[0] = 0;
psz_filename );
free( psz_filename );
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return -1;
}
fclose( file );
free( psz_filename );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
return 0;
}
int i_index, i_count;
/* Check if there's anything to save */
- vlc_mutex_lock( &p_this->p_vlc->config_lock );
+ vlc_mutex_lock( &p_this->p_libvlc->config_lock );
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
i_count = p_list->i_count;
for( i_index = 0; i_index < i_count; i_index++ )
if( p_item->i_type != CONFIG_HINT_END ) break;
}
vlc_list_release( p_list );
- vlc_mutex_unlock( &p_this->p_vlc->config_lock );
+ vlc_mutex_unlock( &p_this->p_libvlc->config_lock );
if( i_index == i_count ) return VLC_SUCCESS;
return SaveConfigFile( p_this, 0, VLC_TRUE );
char *psz_shortopts;
/* Set default configuration and copy arguments */
- p_this->p_vlc->i_argc = *pi_argc;
- p_this->p_vlc->ppsz_argv = ppsz_argv;
+ p_this->p_libvlc->i_argc = *pi_argc;
+ p_this->p_libvlc->ppsz_argv = ppsz_argv;
#ifdef __APPLE__
/* When VLC.app is run by double clicking in Mac OS X, the 2nd arg
vlc_list_release( p_list );
return -1;
}
- memcpy( ppsz_argv, p_this->p_vlc->ppsz_argv,
+ memcpy( ppsz_argv, p_this->p_libvlc->ppsz_argv,
*pi_argc * sizeof(char *) );
}
{
fprintf( stderr, "%s: unknown option"
" or missing mandatory argument ",
- p_this->p_vlc->psz_object_name );
+ p_this->p_libvlc->psz_object_name );
if( optopt )
{
fprintf( stderr, "`-%c'\n", optopt );
fprintf( stderr, "`%s'\n", ppsz_argv[optind-1] );
}
fprintf( stderr, "Try `%s --help' for more information.\n",
- p_this->p_vlc->psz_object_name );
+ p_this->p_libvlc->psz_object_name );
for( i_index = 0; p_longopts[i_index].name; i_index++ )
free( (char *)p_longopts[i_index].name );
const char *config_GetDataDir( const vlc_object_t *p_this )
{
#if defined (WIN32) || defined (UNDER_CE)
- return p_this->p_libvlc->psz_vlcpath;
+ return p_this->p_libvlc_global->psz_vlcpath;
#elif defined(__APPLE__) || defined (SYS_BEOS)
static char path[PATH_MAX] = "";
if( *path == '\0' )
{
snprintf( path, sizeof( path ), "%s/share",
- p_this->p_libvlc->psz_vlcpath );
+ p_this->p_libvlc_global->psz_vlcpath );
path[sizeof( path ) - 1] = '\0';
}
return path;
char *p_char, *p_oldchar = &i_dummy;
/* Get the full program path and name */
- p_char = p_this->p_libvlc->psz_vlcpath = strdup( ppsz_argv[ 0 ] );
+ p_char = p_this->p_libvlc_global->psz_vlcpath = strdup( ppsz_argv[ 0 ] );
/* Remove trailing program name */
for( ; *p_char ; )
[o_pool release];
}
- vlc_mutex_init( p_this, &p_this->p_libvlc->iconv_lock );
- p_this->p_libvlc->iconv_macosx = vlc_iconv_open( "UTF-8", "UTF-8-MAC" );
+ vlc_mutex_init( p_this, &p_this->p_libvlc_global->iconv_lock );
+ p_this->p_libvlc_global->iconv_macosx = vlc_iconv_open( "UTF-8", "UTF-8-MAC" );
}
/*****************************************************************************
*****************************************************************************/
void system_End( vlc_t *p_this )
{
- free( p_this->p_libvlc->psz_vlcpath );
+ free( p_this->p_libvlc_global->psz_vlcpath );
- if ( p_this->p_libvlc->iconv_macosx != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_this->p_libvlc->iconv_macosx );
- vlc_mutex_destroy( &p_this->p_libvlc->iconv_lock );
+ if ( p_this->p_libvlc_global->iconv_macosx != (vlc_iconv_t)-1 )
+ vlc_iconv_close( p_this->p_libvlc_global->iconv_macosx );
+ vlc_mutex_destroy( &p_this->p_libvlc_global->iconv_lock );
}
void devices_ProbeCreate( vlc_object_t *p_this )
{
intf_thread_t * p_probe;
- p_this->p_libvlc->p_probe = NULL;
+ p_this->p_libvlc_global->p_probe = NULL;
/* Allocate structure */
p_probe = vlc_object_create( p_this, VLC_OBJECT_INTF );
return;
}
- p_this->p_libvlc->p_probe = p_probe;
+ p_this->p_libvlc_global->p_probe = p_probe;
}
*/
void __msg_Create( vlc_object_t *p_this )
{
- vlc_mutex_init( p_this, &(p_this->p_libvlc->msg_bank.lock) );
+ vlc_mutex_init( p_this, &(p_this->p_libvlc_global->msg_bank.lock) );
CreateMsgQueue( p_this, MSG_QUEUE_NORMAL );
CreateMsgQueue( p_this, MSG_QUEUE_HTTPD_ACCESS );
#ifdef UNDER_CE
- p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile =
+ p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile =
CreateFile( L"vlc-log.txt", GENERIC_WRITE,
FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
CREATE_ALWAYS, 0, NULL );
- SetFilePointer( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->
+ SetFilePointer( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->
logfile, 0, NULL, FILE_END );
#endif
p_queue->i_sub = 0;
p_queue->pp_sub = NULL;
- INSERT_ELEM( p_this->p_libvlc->msg_bank.pp_queues,
- p_this->p_libvlc->msg_bank.i_queues,
+ INSERT_ELEM( p_this->p_libvlc_global->msg_bank.pp_queues,
+ p_this->p_libvlc_global->msg_bank.i_queues,
i_queue,
p_queue );
}
{
int i;
- for( i = 0 ; i < p_this->p_libvlc->msg_bank.i_queues; i++ )
+ for( i = 0 ; i < p_this->p_libvlc_global->msg_bank.i_queues; i++ )
{
- vlc_mutex_lock( &p_this->p_libvlc->msg_bank.pp_queues[i]->lock );
- FlushMsg( p_this->p_libvlc->msg_bank.pp_queues[i] );
- vlc_mutex_unlock( &p_this->p_libvlc->msg_bank.pp_queues[i]->lock );
+ vlc_mutex_lock( &p_this->p_libvlc_global->msg_bank.pp_queues[i]->lock );
+ FlushMsg( p_this->p_libvlc_global->msg_bank.pp_queues[i] );
+ vlc_mutex_unlock( &p_this->p_libvlc_global->msg_bank.pp_queues[i]->lock );
}
}
void __msg_Destroy( vlc_object_t *p_this )
{
int i;
- for( i = p_this->p_libvlc->msg_bank.i_queues -1 ; i >= 0; i-- )
+ for( i = p_this->p_libvlc_global->msg_bank.i_queues -1 ; i >= 0; i-- )
{
- msg_queue_t *p_queue = p_this->p_libvlc->msg_bank.pp_queues[i];
+ msg_queue_t *p_queue = p_this->p_libvlc_global->msg_bank.pp_queues[i];
if( p_queue->i_sub )
{
msg_Err( p_this, "stale interface subscribers" );
#ifdef UNDER_CE
if( i == MSG_QUEUE_NORMAL )
- CloseHandle( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile );
+ CloseHandle( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile );
#endif
/* Destroy lock */
vlc_mutex_destroy( &p_queue->lock );
- REMOVE_ELEM( p_this->p_libvlc->msg_bank.pp_queues,
- p_this->p_libvlc->msg_bank.i_queues, i );
+ REMOVE_ELEM( p_this->p_libvlc_global->msg_bank.pp_queues,
+ p_this->p_libvlc_global->msg_bank.i_queues, i );
free( p_queue );
}
- vlc_mutex_destroy( &(p_this->p_libvlc->msg_bank.lock) );
+ vlc_mutex_destroy( &(p_this->p_libvlc_global->msg_bank.lock) );
}
/**
*/
msg_subscription_t *__msg_Subscribe( vlc_object_t *p_this, int i_queue )
{
- msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank;
+ msg_bank_t *p_bank = &p_this->p_libvlc_global->msg_bank;
msg_subscription_t *p_sub = malloc( sizeof( msg_subscription_t ) );
msg_queue_t *p_queue = NULL;
int i;
*/
void __msg_Unsubscribe( vlc_object_t *p_this, msg_subscription_t *p_sub )
{
- msg_bank_t *p_bank = &p_this->p_libvlc->msg_bank;
+ msg_bank_t *p_bank = &p_this->p_libvlc_global->msg_bank;
int i,j;
vlc_mutex_lock( &p_bank->lock );
return;
}
- p_bank = &p_this->p_libvlc->msg_bank;
+ p_bank = &p_this->p_libvlc_global->msg_bank;
/*
* Convert message to string
switch( i_type )
{
case VLC_MSG_ERR:
- if( p_this->p_libvlc->i_verbose < 0 ) return;
+ if( p_this->p_libvlc_global->i_verbose < 0 ) return;
break;
case VLC_MSG_INFO:
- if( p_this->p_libvlc->i_verbose < 0 ) return;
+ if( p_this->p_libvlc_global->i_verbose < 0 ) return;
break;
case VLC_MSG_WARN:
- if( p_this->p_libvlc->i_verbose < 1 ) return;
+ if( p_this->p_libvlc_global->i_verbose < 1 ) return;
break;
case VLC_MSG_DBG:
- if( p_this->p_libvlc->i_verbose < 2 ) return;
+ if( p_this->p_libvlc_global->i_verbose < 2 ) return;
break;
}
switch( p_item->i_object_type )
{
case VLC_OBJECT_ROOT: psz_object = "root"; break;
- case VLC_OBJECT_VLC: psz_object = "vlc"; break;
+ case VLC_OBJECT_LIBVLC: psz_object = "libvlc"; break;
case VLC_OBJECT_MODULE: psz_object = "module"; break;
case VLC_OBJECT_INTF: psz_object = "interface"; break;
case VLC_OBJECT_PLAYLIST: psz_object = "playlist"; break;
}
#ifdef UNDER_CE
-# define CE_WRITE(str) WriteFile( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile, \
+# define CE_WRITE(str) WriteFile( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile, \
str, strlen(str), &i_dummy, NULL );
CE_WRITE( p_item->psz_module );
CE_WRITE( " " );
CE_WRITE( ": " );
CE_WRITE( p_item->psz_msg );
CE_WRITE( "\r\n" );
- FlushFileBuffers( p_this->p_libvlc->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile );
+ FlushFileBuffers( p_this->p_libvlc_global->msg_bank.pp_queues[MSG_QUEUE_NORMAL]->logfile );
#else
/* Send the message to stderr */
- if( p_this->p_libvlc->b_color )
+ if( p_this->p_libvlc_global->b_color )
{
if( p_item->psz_header )
{
module_bank_t *p_bank;
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank )
+ if( p_this->p_libvlc_global->p_module_bank )
{
- p_this->p_libvlc->p_module_bank->i_usage++;
+ p_this->p_libvlc_global->p_module_bank->i_usage++;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
p_bank->psz_object_name = "module bank";
#endif
/* Everything worked, attach the object */
- p_this->p_libvlc->p_module_bank = p_bank;
- vlc_object_attach( p_bank, p_this->p_libvlc );
+ p_this->p_libvlc_global->p_module_bank = p_bank;
+ vlc_object_attach( p_bank, p_this->p_libvlc_global );
module_LoadMain( p_this );
module_t * p_next;
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( !p_this->p_libvlc->p_module_bank )
+ if( !p_this->p_libvlc_global->p_module_bank )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- if( --p_this->p_libvlc->p_module_bank->i_usage )
+ if( --p_this->p_libvlc_global->p_module_bank->i_usage )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
config_AutoSaveConfigFile( p_this );
#ifdef HAVE_DYNAMIC_PLUGINS
-#define p_bank p_this->p_libvlc->p_module_bank
+#define p_bank p_this->p_libvlc_global->p_module_bank
if( p_bank->b_cache ) CacheSave( p_this );
while( p_bank->i_loaded_cache-- )
{
#undef p_bank
#endif
- vlc_object_detach( p_this->p_libvlc->p_module_bank );
+ vlc_object_detach( p_this->p_libvlc_global->p_module_bank );
- while( p_this->p_libvlc->p_module_bank->i_children )
+ while( p_this->p_libvlc_global->p_module_bank->i_children )
{
- p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0];
+ p_next = (module_t *)p_this->p_libvlc_global->p_module_bank->pp_children[0];
if( DeleteModule( p_next ) )
{
}
}
- vlc_object_destroy( p_this->p_libvlc->p_module_bank );
- p_this->p_libvlc->p_module_bank = NULL;
+ vlc_object_destroy( p_this->p_libvlc_global->p_module_bank );
+ p_this->p_libvlc_global->p_module_bank = NULL;
return;
}
{
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_main )
+ if( p_this->p_libvlc_global->p_module_bank->b_main )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_main = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
AllocateBuiltinModule( p_this, vlc_entry__main );
}
{
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_builtins )
+ if( p_this->p_libvlc_global->p_module_bank->b_builtins )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
#ifdef HAVE_DYNAMIC_PLUGINS
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_plugins )
+ if( p_this->p_libvlc_global->p_module_bank->b_plugins )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
msg_Dbg( p_this, "checking plugin modules" );
if( config_GetInt( p_this, "plugins-cache" ) )
- p_this->p_libvlc->p_module_bank->b_cache = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_cache = VLC_TRUE;
- if( p_this->p_libvlc->p_module_bank->b_cache ||
- p_this->p_libvlc->p_module_bank->b_cache_delete ) CacheLoad( p_this );
+ if( p_this->p_libvlc_global->p_module_bank->b_cache ||
+ p_this->p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this );
AllocateAllPlugins( p_this );
#endif
}
/* Test if we have the required CPU */
- if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu )
+ if( (p_module->i_cpu & p_this->p_libvlc_global->i_cpu) != p_module->i_cpu )
{
continue;
}
if( !i_shortcuts && p_module->psz_program
&& !strcmp( psz_capability, "interface" )
&& !strcmp( p_module->psz_program,
- p_this->p_vlc->psz_object_name ) )
+ p_this->p_libvlc->psz_object_name ) )
{
if( !b_intf )
{
#endif
{
int i_dirlen = strlen( *ppsz_path );
- i_dirlen += strlen( p_this->p_libvlc->psz_vlcpath ) + 2;
+ i_dirlen += strlen( p_this->p_libvlc_global->psz_vlcpath ) + 2;
psz_fullpath = malloc( i_dirlen );
if( psz_fullpath == NULL )
}
#ifdef WIN32
sprintf( psz_fullpath, "%s\\%s",
- p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+ p_this->p_libvlc_global->psz_vlcpath, *ppsz_path );
#else
sprintf( psz_fullpath, "%s/%s",
- p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+ p_this->p_libvlc_global->psz_vlcpath, *ppsz_path );
#endif
}
else
#endif
char * psz_file;
- if( p_this->p_vlc->b_die || i_maxdepth < 0 )
+ if( p_this->p_libvlc->b_die || i_maxdepth < 0 )
{
return;
}
AllocatePluginFile( p_this, psz_file, i_time, i_size );
}
}
- while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) );
+ while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) );
/* Close the directory */
FindClose( handle );
i_dirlen = strlen( psz_dir );
/* Parse the directory and try to load all files it contains. */
- while( !p_this->p_vlc->b_die && (file = readdir( dir )) )
+ while( !p_this->p_libvlc->b_die && (file = readdir( dir )) )
{
struct stat statbuf;
unsigned int i_len;
/* msg_Dbg( p_this, "plugin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank );
}
- if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0;
+ if( !p_this->p_libvlc_global->p_module_bank->b_cache ) return 0;
/* Add entry to cache */
-#define p_bank p_this->p_libvlc->p_module_bank
+#define p_bank p_this->p_libvlc_global->p_module_bank
p_bank->pp_cache =
realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) );
p_module->psz_filename = psz_file;
p_module->handle = handle;
#ifndef HAVE_SHARED_LIBVLC
- p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols;
+ p_module->p_symbols = &p_this->p_libvlc_global->p_module_bank->symbols;
#endif
p_module->b_loaded = VLC_TRUE;
/* msg_Dbg( p_this, "builtin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank );
return 0;
}
module_cache_t **pp_cache = 0;
int32_t i_file_size, i_marker;
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
return;
}
- if( p_this->p_libvlc->p_module_bank->b_cache_delete )
+ if( p_this->p_libvlc_global->p_module_bank->b_cache_delete )
{
#if !defined( UNDER_CE )
unlink( psz_filename );
return;
}
- p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0;
fread( &i_cache, sizeof(char), sizeof(i_cache), file );
if( i_cache )
- pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache =
malloc( i_cache * sizeof(void *) );
#define LOAD_IMMEDIATE(a) \
int i_submodules;
pp_cache[i] = malloc( sizeof(module_cache_t) );
- p_this->p_libvlc->p_module_bank->i_loaded_cache++;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache++;
/* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
/* TODO: cleanup */
- p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0;
fclose( file );
return;
module_cache_t **pp_cache;
int32_t i_file_size = 0;
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
i_file_size = ftell( file );
fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
- i_cache = p_this->p_libvlc->p_module_bank->i_cache;
- pp_cache = p_this->p_libvlc->p_module_bank->pp_cache;
+ i_cache = p_this->p_libvlc_global->p_module_bank->i_cache;
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_cache;
fwrite( &i_cache, sizeof(char), sizeof(i_cache), file );
module_cache_t **pp_cache;
int i_cache, i;
- pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache;
- i_cache = p_this->p_libvlc->p_module_bank->i_loaded_cache;
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache;
+ i_cache = p_this->p_libvlc_global->p_module_bank->i_loaded_cache;
for( i = 0; i < i_cache; i++ )
{
switch( i_type )
{
case VLC_OBJECT_ROOT:
- i_size = sizeof(libvlc_t);
+ i_size = sizeof(libvlc_global_data_t);
psz_type = "root";
break;
- case VLC_OBJECT_VLC:
- i_size = sizeof(vlc_t);
- psz_type = "vlc";
+ case VLC_OBJECT_LIBVLC:
+ i_size = sizeof(libvlc_int_t);
+ psz_type = "libvlc";
break;
case VLC_OBJECT_MODULE:
i_size = sizeof(module_t);
if( i_type == VLC_OBJECT_ROOT )
{
- /* If i_type is root, then p_new is actually p_libvlc */
- p_new->p_libvlc = (libvlc_t*)p_new;
- p_new->p_vlc = NULL;
+ /* If i_type is root, then p_new is actually p_libvlc_global */
+ p_new->p_libvlc_global = (libvlc_global_data_t*)p_new;
+ p_new->p_libvlc = NULL;
- p_new->p_libvlc->i_counter = 0;
+ p_new->p_libvlc_global->i_counter = 0;
p_new->i_object_id = 0;
- p_new->p_libvlc->i_objects = 1;
- p_new->p_libvlc->pp_objects = malloc( sizeof(vlc_object_t *) );
- p_new->p_libvlc->pp_objects[0] = p_new;
+ p_new->p_libvlc_global->i_objects = 1;
+ p_new->p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
+ p_new->p_libvlc_global->pp_objects[0] = p_new;
p_new->b_attached = VLC_TRUE;
}
else
{
- p_new->p_libvlc = p_this->p_libvlc;
- p_new->p_vlc = ( i_type == VLC_OBJECT_VLC ) ? (vlc_t*)p_new
- : p_this->p_vlc;
+ p_new->p_libvlc_global = p_this->p_libvlc_global;
+ p_new->p_libvlc = ( i_type == VLC_OBJECT_LIBVLC ) ? (libvlc_int_t*)p_new
+ : p_this->p_libvlc;
vlc_mutex_lock( &structure_lock );
- p_new->p_libvlc->i_counter++;
- p_new->i_object_id = p_new->p_libvlc->i_counter;
+ p_new->p_libvlc_global->i_counter++;
+ p_new->i_object_id = p_new->p_libvlc_global->i_counter;
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- INSERT_ELEM( p_new->p_libvlc->pp_objects,
- p_new->p_libvlc->i_objects,
- p_new->p_libvlc->i_objects,
- p_new );
+ TAB_APPEND( p_new->p_libvlc_global->i_objects,
+ p_new->p_libvlc_global->pp_objects,
+ p_new );
vlc_mutex_unlock( &structure_lock );
}
if( p_this->i_object_type == VLC_OBJECT_ROOT )
{
/* We are the root object ... no need to lock. */
- free( p_this->p_libvlc->pp_objects );
- p_this->p_libvlc->pp_objects = NULL;
- p_this->p_libvlc->i_objects--;
+ free( p_this->p_libvlc_global->pp_objects );
+ p_this->p_libvlc_global->pp_objects = NULL;
+ p_this->p_libvlc_global->i_objects--;
vlc_mutex_destroy( &structure_lock );
}
/* Wooohaa! If *this* fails, we're in serious trouble! Anyway it's
* useless to try and recover anything if pp_objects gets smashed. */
- i_index = FindIndex( p_this, p_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects );
- REMOVE_ELEM( p_this->p_libvlc->pp_objects,
- p_this->p_libvlc->i_objects, i_index );
+ i_index = FindIndex( p_this, p_this->p_libvlc_global->pp_objects,
+ p_this->p_libvlc_global->i_objects );
+ REMOVE_ELEM( p_this->p_libvlc_global->pp_objects,
+ p_this->p_libvlc_global->i_objects, i_index );
vlc_mutex_unlock( &structure_lock );
}
vlc_mutex_lock( &structure_lock );
- pp_objects = p_this->p_libvlc->pp_objects;
+ pp_objects = p_this->p_libvlc_global->pp_objects;
/* Perform our dichotomy */
- for( i_max = p_this->p_libvlc->i_objects - 1 ; ; )
+ for( i_max = p_this->p_libvlc_global->i_objects - 1 ; ; )
{
i_middle = i_max / 2;
/* Find the root */
while( p_root->p_parent != NULL &&
- p_root != VLC_OBJECT( p_this->p_vlc ) )
+ p_root != VLC_OBJECT( p_this->p_libvlc ) )
{
p_root = p_root->p_parent;
}
p_found = FindObject( p_root, i_type, (i_mode & ~0x000f)|FIND_CHILD );
- if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_vlc ) )
+ if( p_found == NULL && p_root != VLC_OBJECT( p_this->p_libvlc ) )
{
- p_found = FindObject( VLC_OBJECT( p_this->p_vlc ),
+ p_found = FindObject( VLC_OBJECT( p_this->p_libvlc ),
i_type, (i_mode & ~0x000f)|FIND_CHILD );
}
}
switch( i_mode & 0x000f )
{
case FIND_ANYWHERE:
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
}
p_list = NewList( i_count );
- pp_current = p_this->p_libvlc->pp_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
}
else
{
- p_object = p_this->p_vlc ? VLC_OBJECT(p_this->p_vlc) : p_this;
+ p_object = p_this->p_libvlc ? VLC_OBJECT(p_this->p_libvlc) : p_this;
}
vlc_mutex_lock( &structure_lock );
vlc_mutex_lock( &structure_lock );
- pp_current = p_this->p_libvlc->pp_objects;
- pp_end = pp_current + p_this->p_libvlc->i_objects;
+ pp_current = p_this->p_libvlc_global->pp_objects;
+ pp_end = pp_current + p_this->p_libvlc_global->i_objects;
for( ; pp_current < pp_end ; pp_current++ )
{
int __stats_Update( vlc_object_t *p_this, counter_t *p_counter,
vlc_value_t val, vlc_value_t *val_new )
{
- if( !p_this->p_libvlc->b_stats || !p_counter ) return VLC_EGENERIC;
+ if( !p_this->p_libvlc_global->b_stats || !p_counter ) return VLC_EGENERIC;
return CounterUpdate( p_this, p_counter, val, val_new );
}
*/
int __stats_Get( vlc_object_t *p_this, counter_t *p_counter, vlc_value_t *val )
{
- if( !p_this->p_libvlc->b_stats || !p_counter || p_counter->i_samples == 0 )
+ if( !p_this->p_libvlc_global->b_stats || !p_counter || p_counter->i_samples == 0 )
{
val->i_int = val->f_float = 0.0;
return VLC_EGENERIC;
void stats_ComputeInputStats( input_thread_t *p_input, input_stats_t *p_stats )
{
- if( !p_input->p_libvlc->b_stats ) return;
+ if( !p_input->p_libvlc_global->b_stats ) return;
vlc_mutex_lock( &p_input->counters.counters_lock );
vlc_mutex_lock( &p_stats->lock );
vlc_list_t *p_list;
int i_index;
- if( !p_obj->p_libvlc->b_stats ) return;
+ if( !p_obj->p_libvlc_global->b_stats ) return;
vlc_mutex_lock( &p_stats->lock );
{
int i;
counter_t *p_counter = NULL;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
+ if( !p_obj->p_libvlc_global->b_stats ) return;
+ vlc_mutex_lock( &p_obj->p_libvlc_global->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ for( i = 0 ; i < p_obj->p_libvlc_global->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc_global->pp_timers[i]->i_id == i_id )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = p_obj->p_libvlc_global->pp_timers[i];
break;
}
}
if( !p_counter )
{
counter_sample_t *p_sample;
- p_counter = stats_CounterCreate( p_obj->p_libvlc, VLC_VAR_TIME,
+ p_counter = stats_CounterCreate( p_obj->p_libvlc_global, VLC_VAR_TIME,
STATS_TIMER );
if( !p_counter )
{
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
return;
}
p_counter->psz_name = strdup( psz_name );
p_counter->i_id = i_id;
- INSERT_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers,
- p_obj->p_libvlc->i_timers, p_counter );
+ INSERT_ELEM( p_obj->p_libvlc_global->pp_timers, p_obj->p_libvlc_global->i_timers,
+ p_obj->p_libvlc_global->i_timers, p_counter );
/* 1st sample : if started: start_date, else last_time, b_started */
p_sample = (counter_sample_t *)malloc( sizeof( counter_sample_t ) );
if( p_counter->pp_samples[0]->value.b_bool == VLC_TRUE )
{
msg_Warn( p_obj, "timer %s was already started !", psz_name );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
return;
}
p_counter->pp_samples[0]->value.b_bool = VLC_TRUE;
p_counter->pp_samples[0]->date = mdate();
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
}
void __stats_TimerStop( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ if( !p_obj->p_libvlc_global->b_stats ) return;
+ vlc_mutex_lock( &p_obj->p_libvlc_global->timer_lock );
+ for( i = 0 ; i < p_obj->p_libvlc_global->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc_global->pp_timers[i]->i_id == i_id )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = p_obj->p_libvlc_global->pp_timers[i];
break;
}
}
if( !p_counter || p_counter->i_samples != 2 )
{
msg_Err( p_obj, "timer does not exist" );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
return;
}
p_counter->pp_samples[0]->value.b_bool = VLC_FALSE;
p_counter->pp_samples[1]->value.i_int += 1;
p_counter->pp_samples[0]->date = mdate() - p_counter->pp_samples[0]->date;
p_counter->pp_samples[1]->date += p_counter->pp_samples[0]->date;
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
}
void __stats_TimerDump( vlc_object_t *p_obj, unsigned int i_id )
{
counter_t *p_counter = NULL;
int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for( i = 0 ; i < p_obj->p_libvlc->i_timers; i++ )
+ if( !p_obj->p_libvlc_global->b_stats ) return;
+ vlc_mutex_lock( &p_obj->p_libvlc_global->timer_lock );
+ for( i = 0 ; i < p_obj->p_libvlc_global->i_timers; i++ )
{
- if( p_obj->p_libvlc->pp_timers[i]->i_id == i_id )
+ if( p_obj->p_libvlc_global->pp_timers[i]->i_id == i_id )
{
- p_counter = p_obj->p_libvlc->pp_timers[i];
+ p_counter = p_obj->p_libvlc_global->pp_timers[i];
break;
}
}
TimerDump( p_obj, p_counter, VLC_TRUE );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
}
void __stats_TimersDumpAll( vlc_object_t *p_obj )
{
int i;
- if( !p_obj->p_libvlc->b_stats ) return;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for ( i = 0 ; i< p_obj->p_libvlc->i_timers ; i++ )
- TimerDump( p_obj, p_obj->p_libvlc->pp_timers[i], VLC_FALSE );
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ if( !p_obj->p_libvlc_global->b_stats ) return;
+ vlc_mutex_lock( &p_obj->p_libvlc_global->timer_lock );
+ for ( i = 0 ; i< p_obj->p_libvlc_global->i_timers ; i++ )
+ TimerDump( p_obj, p_obj->p_libvlc_global->pp_timers[i], VLC_FALSE );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
}
void __stats_TimersClean( vlc_object_t *p_obj )
{
int i;
- vlc_mutex_lock( &p_obj->p_libvlc->timer_lock );
- for ( i = p_obj->p_libvlc->i_timers -1 ; i >= 0; i-- )
+ vlc_mutex_lock( &p_obj->p_libvlc_global->timer_lock );
+ for ( i = p_obj->p_libvlc_global->i_timers -1 ; i >= 0; i-- )
{
- counter_t *p_counter = p_obj->p_libvlc->pp_timers[i];
- REMOVE_ELEM( p_obj->p_libvlc->pp_timers, p_obj->p_libvlc->i_timers, i );
+ counter_t *p_counter = p_obj->p_libvlc_global->pp_timers[i];
+ REMOVE_ELEM( p_obj->p_libvlc_global->pp_timers, p_obj->p_libvlc_global->i_timers, i );
stats_CounterClean( p_counter );
}
- vlc_mutex_unlock( &p_obj->p_libvlc->timer_lock );
+ vlc_mutex_unlock( &p_obj->p_libvlc_global->timer_lock );
}
void stats_CounterClean( counter_t *p_c )
*****************************************************************************/
int __vlc_threads_init( vlc_object_t *p_this )
{
- libvlc_t *p_libvlc = (libvlc_t *)p_this;
+ libvlc_global_data_t *p_libvlc_global = (libvlc_global_data_t *)p_this;
int i_ret = VLC_SUCCESS;
/* If we have lazy mutex initialization, use it. Otherwise, we just
i_status = VLC_THREADS_PENDING;
/* We should be safe now. Do all the initialization stuff we want. */
- p_libvlc->b_ready = VLC_FALSE;
+ p_libvlc_global->b_ready = VLC_FALSE;
#if defined( PTH_INIT_IN_PTH_H )
i_ret = ( pth_init() == FALSE );
hInstLib = LoadLibrary( "kernel32" );
if( hInstLib )
{
- p_libvlc->SignalObjectAndWait =
+ p_libvlc_global->SignalObjectAndWait =
(SIGNALOBJECTANDWAIT)GetProcAddress( hInstLib,
"SignalObjectAndWait" );
}
}
else
{
- p_libvlc->SignalObjectAndWait = NULL;
+ p_libvlc_global->SignalObjectAndWait = NULL;
}
- p_libvlc->b_fast_mutex = 0;
- p_libvlc->i_win9x_cv = 0;
+ p_libvlc_global->b_fast_mutex = 0;
+ p_libvlc_global->i_win9x_cv = 0;
#elif defined( HAVE_KERNEL_SCHEDULER_H )
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
#elif defined( HAVE_CTHREADS_H )
#endif
- p_root = vlc_object_create( p_libvlc, VLC_OBJECT_ROOT );
+ p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_ROOT );
if( p_root == NULL )
i_ret = VLC_ENOMEM;
* function and have a 100% correct vlc_cond_wait() implementation.
* As this function is not available on Win9x, we can use the faster
* CriticalSections */
- if( p_this->p_libvlc->SignalObjectAndWait &&
- !p_this->p_libvlc->b_fast_mutex )
+ if( p_this->p_libvlc_global->SignalObjectAndWait &&
+ !p_this->p_libvlc_global->b_fast_mutex )
{
/* We are running on NT/2K/XP, we can use SignalObjectAndWait */
p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
p_condvar->i_waiting_threads = 0;
/* Misc init */
- p_condvar->i_win9x_cv = p_this->p_libvlc->i_win9x_cv;
- p_condvar->SignalObjectAndWait = p_this->p_libvlc->SignalObjectAndWait;
+ p_condvar->i_win9x_cv = p_this->p_libvlc_global->i_win9x_cv;
+ p_condvar->SignalObjectAndWait = p_this->p_libvlc_global->SignalObjectAndWait;
- if( (p_condvar->SignalObjectAndWait && !p_this->p_libvlc->b_fast_mutex)
+ if( (p_condvar->SignalObjectAndWait &&
+ !p_this->p_libvlc_global->b_fast_mutex)
|| p_condvar->i_win9x_cv == 0 )
{
/* Create an auto-reset event. */
vlc_mutex_init( p_this, &p_update->lock );
- p_update->p_vlc = p_this->p_vlc;
+ p_update->p_libvlc = p_this->p_libvlc;
p_update->p_releases = NULL;
p_update->i_releases = 0;
return;
}
- p_xml = xml_Create( p_update->p_vlc );
+ p_xml = xml_Create( p_update->p_libvlc );
if( !p_xml )
{
- msg_Err( p_update->p_vlc, "Failed to open XML parser" );
+ msg_Err( p_update->p_libvlc, "Failed to open XML parser" );
goto error;
}
- p_stream = stream_UrlNew( p_update->p_vlc, UPDATE_VLC_MIRRORS_URL );
+ p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_MIRRORS_URL );
if( !p_stream )
{
- msg_Err( p_update->p_vlc, "Failed to open %s for reading",
+ msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
UPDATE_VLC_MIRRORS_URL );
goto error;
}
if( !p_xml_reader )
{
- msg_Err( p_update->p_vlc, "Failed to open %s for parsing",
+ msg_Err( p_update->p_libvlc, "Failed to open %s for parsing",
UPDATE_VLC_MIRRORS_URL );
goto error;
}
switch( xml_ReaderNodeType( p_xml_reader ) )
{
case -1:
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_MIRRORS_URL );
goto error;
psz_eltname = xml_ReaderName( p_xml_reader );
if( !psz_eltname )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_MIRRORS_URL );
goto error;
}
if( !psz_name || !psz_value )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_MIRRORS_URL );
goto error;
}
psz_eltname = xml_ReaderName( p_xml_reader );
if( !psz_eltname )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_MIRRORS_URL );
goto error;
}
return;
}
- p_xml = xml_Create( p_update->p_vlc );
+ p_xml = xml_Create( p_update->p_libvlc );
if( !p_xml )
{
- msg_Err( p_update->p_vlc, "Failed to open XML parser" );
+ msg_Err( p_update->p_libvlc, "Failed to open XML parser" );
goto error;
}
- p_stream = stream_UrlNew( p_update->p_vlc, UPDATE_VLC_STATUS_URL );
+ p_stream = stream_UrlNew( p_update->p_libvlc, UPDATE_VLC_STATUS_URL );
if( !p_stream )
{
- msg_Err( p_update->p_vlc, "Failed to open %s for reading",
+ msg_Err( p_update->p_libvlc, "Failed to open %s for reading",
UPDATE_VLC_STATUS_URL );
goto error;
}
if( !p_xml_reader )
{
- msg_Err( p_update->p_vlc, "Failed to open %s for parsing",
+ msg_Err( p_update->p_libvlc, "Failed to open %s for parsing",
UPDATE_VLC_STATUS_URL );
goto error;
}
switch( xml_ReaderNodeType( p_xml_reader ) )
{
case -1:
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_STATUS_URL );
goto error;
psz_eltname = xml_ReaderName( p_xml_reader );
if( !psz_eltname )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_STATUS_URL );
goto error;
}
if( !psz_name || !psz_value )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_STATUS_URL );
goto error;
}
psz_eltname = xml_ReaderName( p_xml_reader );
if( !psz_eltname )
{
- msg_Err( p_update->p_vlc, "Error while parsing %s",
+ msg_Err( p_update->p_libvlc, "Error while parsing %s",
UPDATE_VLC_STATUS_URL );
goto error;
}
void update_download( update_iterator_t *p_uit, char *psz_dest )
{
download_thread_t *p_dt =
- vlc_object_create( p_uit->p_u->p_vlc, sizeof( download_thread_t ) );
+ vlc_object_create( p_uit->p_u->p_libvlc, sizeof( download_thread_t ) );
p_dt->psz_dest = strdup( psz_dest );
p_dt->psz_src = strdup( p_uit->file.psz_url );
char *psz_dest = p_this->psz_dest;
char *psz_src = p_this->psz_src;
stream_t *p_stream;
- vlc_t *p_vlc = p_this->p_vlc;
+ libvlc_int_t *p_libvlc = p_this->p_libvlc;
FILE *p_file = NULL;
void *p_buffer;
asprintf( &psz_status, "%s\nDownloading... 0.0/? %.1f%% done",
p_this->psz_status, 0.0 );
- i_progress = intf_UserProgress( p_vlc, "Downloading...",
+ i_progress = intf_UserProgress( p_libvlc, "Downloading...",
psz_status, 0.0, 0 );
- p_stream = stream_UrlNew( p_vlc, psz_src );
+ p_stream = stream_UrlNew( p_libvlc, psz_src );
if( !p_stream )
{
- msg_Err( p_vlc, "Failed to open %s for reading", psz_src );
- intf_UserFatal( p_vlc, VLC_TRUE, "Error while Downloading...",
+ msg_Err( p_libvlc, "Failed to open %s for reading", psz_src );
+ intf_UserFatal( p_libvlc, VLC_TRUE, "Error while Downloading...",
"VLC failed to open %s for reading.", psz_src );
- intf_UserHide( p_vlc, i_progress );
+ intf_UserHide( p_libvlc, i_progress );
}
else
{
p_file = utf8_fopen( psz_dest, "w" );
if( !p_file )
{
- msg_Err( p_vlc, "Failed to open %s for writing", psz_dest );
- intf_UserFatal( p_vlc, VLC_TRUE, "Error while Downloading...",
+ msg_Err( p_libvlc, "Failed to open %s for writing", psz_dest );
+ intf_UserFatal( p_libvlc, VLC_TRUE, "Error while Downloading...",
"VLC failed to open %s for writing.", psz_dest );
- intf_UserHide( p_vlc, i_progress );
+ intf_UserHide( p_libvlc, i_progress );
}
else
{
p_this->psz_status, psz_s1, psz_s2, f_progress );
free( psz_s1 ); free( psz_s2 );
- intf_ProgressUpdate( p_vlc, i_progress,
+ intf_ProgressUpdate( p_libvlc, i_progress,
psz_status, f_progress, 0 );
}
asprintf( &psz_status, "%s\nDone %s (100.00%%)",
p_this->psz_status, psz_s2 );
free( psz_s2 );
- intf_ProgressUpdate( p_vlc, i_progress, psz_status, 100.0, 0 );
+ intf_ProgressUpdate( p_libvlc, i_progress, psz_status, 100.0, 0 );
free( psz_status );
}
}
char *psz_vlmconf;
/* to be sure to avoid multiple creation */
- var_Create( p_this->p_libvlc, "vlm_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "vlm_mutex", &lockval );
+ var_Create( p_this->p_libvlc_global, "vlm_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "vlm_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !(p_vlm = vlc_object_find( p_this, VLC_OBJECT_VLM, FIND_ANYWHERE )) )
return NULL;
}
- vlc_mutex_init( p_this->p_vlc, &p_vlm->lock );
+ vlc_mutex_init( p_this->p_libvlc, &p_vlm->lock );
p_vlm->i_media = 0;
p_vlm->media = NULL;
p_vlm->i_vod = 0;
p_vlm->schedule = NULL;
vlc_object_yield( p_vlm );
- vlc_object_attach( p_vlm, p_this->p_vlc );
+ vlc_object_attach( p_vlm, p_this->p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
{
vlc_value_t lockval;
- var_Get( p_vlm->p_libvlc, "vlm_mutex", &lockval );
+ var_Get( p_vlm->p_libvlc_global, "vlm_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
vlc_object_release( p_vlm );
if( (psz_vlc = strrchr( psz_path, '\\' )) ) *psz_vlc = '\0';
- p_this->p_libvlc->psz_vlcpath = strdup( psz_path );
+ p_this->p_libvlc_global->psz_vlcpath = strdup( psz_path );
/* Set the default file-translation mode */
#if !defined( UNDER_CE )
void system_Configure( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
{
#if !defined( UNDER_CE )
- p_this->p_libvlc->b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
- p_this->p_libvlc->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
+ p_this->p_libvlc_global->b_fast_mutex = config_GetInt( p_this, "fast-mutex" );
+ p_this->p_libvlc_global->i_win9x_cv = config_GetInt( p_this, "win9x-cv-method" );
/* Raise default priority of the current process */
#ifndef ABOVE_NORMAL_PRIORITY_CLASS
*****************************************************************************/
void system_End( vlc_t *p_this )
{
- if( p_this && p_this->p_libvlc && p_this->p_libvlc->psz_vlcpath )
+ if( p_this && p_this->p_libvlc_global && p_this->p_libvlc_global->psz_vlcpath )
{
- free( p_this->p_libvlc->psz_vlcpath );
- p_this->p_libvlc->psz_vlcpath = NULL;
+ free( p_this->p_libvlc_global->psz_vlcpath );
+ p_this->p_libvlc_global->psz_vlcpath = NULL;
}
WSACleanup();
}
/* to be sure to avoid multiple creation */
- var_Create( p_this->p_libvlc, "httpd_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "httpd_mutex", &lockval );
+ var_Create( p_this->p_libvlc_global, "httpd_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "httpd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !(httpd = vlc_object_find( p_this, VLC_OBJECT_HTTPD, FIND_ANYWHERE )) )
httpd->host = NULL;
vlc_object_yield( httpd );
- vlc_object_attach( httpd, p_this->p_vlc );
+ vlc_object_attach( httpd, p_this->p_libvlc );
}
/* verify if it already exist */
vlc_value_t lockval;
int i;
- var_Get( httpd->p_libvlc, "httpd_mutex", &lockval );
+ var_Get( httpd->p_libvlc_global, "httpd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
host->i_ref--;
tls_t *p_tls;
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "tls_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "tls_mutex", &lockval );
+ var_Create( p_this->p_libvlc_global, "tls_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "tls_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_tls = vlc_object_find( p_this, VLC_OBJECT_TLS, FIND_ANYWHERE );
return NULL;
}
- vlc_object_attach( p_tls, p_this->p_vlc );
+ vlc_object_attach( p_tls, p_this->p_libvlc );
vlc_object_yield( p_tls );
msg_Dbg( p_tls, "TLS/SSL provider initialized" );
}
int i;
vlc_value_t lockval;
- var_Get( p_tls->p_libvlc, "tls_mutex", &lockval );
+ var_Get( p_tls->p_libvlc_global, "tls_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
vlc_object_release( p_tls );
int i_steps = 0;
/* to be sure to avoid multiple creation */
- var_Create( p_this->p_libvlc, "osd_mutex", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Create( p_this->p_libvlc_global, "osd_mutex", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL )
p_osd->i_width, p_osd->i_height, NULL );
vlc_object_yield( p_osd );
- vlc_object_attach( p_osd, p_this->p_vlc );
+ vlc_object_attach( p_osd, p_this->p_libvlc );
/* Signal when an update of OSD menu is needed */
var_Create( p_osd, "osd-menu-update", VLC_VAR_BOOL );
if( !p_osd || !p_this ) return;
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
vlc_object_release( p_osd );
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
#if defined(OSD_MENU_DEBUG)
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
#if defined(OSD_MENU_DEBUG)
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
#if defined(OSD_MENU_DEBUG)
p_button->p_current_state->p_pic );
osd_SetMenuUpdate( p_osd, VLC_TRUE );
osd_SetMenuVisible( p_osd, VLC_TRUE );
- osd_SetKeyPressed( VLC_OBJECT(p_osd->p_vlc), config_GetInt( p_osd, p_button->psz_action ) );
+ osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt( p_osd, p_button->psz_action ) );
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select (%d, %s)", config_GetInt( p_osd, p_button->psz_action ), p_button->psz_action );
#endif
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_visible;
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_visible;
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_visible;
*/
if( p_button->b_range )
{
- osd_SetKeyPressed( VLC_OBJECT(p_osd->p_vlc), config_GetInt(p_osd, p_button->psz_action) );
+ osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action) );
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select (%d, %s)", val.i_int, p_button->psz_action );
#endif
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_visible;
*/
if( p_button->b_range )
{
- osd_SetKeyPressed( VLC_OBJECT(p_osd->p_vlc), config_GetInt(p_osd, p_button->psz_action_down) );
+ osd_SetKeyPressed( VLC_OBJECT(p_osd->p_libvlc), config_GetInt(p_osd, p_button->psz_action_down) );
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select (%d, %s)", val.i_int, p_button->psz_action_down );
#endif
{
int i_volume_step = 0;
- i_volume_step = config_GetInt( p_this->p_vlc, "volume-step" );
+ i_volume_step = config_GetInt( p_this->p_libvlc, "volume-step" );
return (i_volume/i_volume_step);
}
return;
}
- var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+ var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval );
vlc_mutex_lock( lockval.p_address );
p_button = p_osd->p_state->p_volume;
if( b_playexit == VLC_TRUE )
{
msg_Info( p_playlist, "end of playlist, exiting" );
- p_playlist->p_vlc->b_die = VLC_TRUE;
+ p_playlist->p_libvlc->b_die = VLC_TRUE;
}
p_playlist->status.i_status = PLAYLIST_STOPPED;
PL_UNLOCK
int playlist_MLLoad( playlist_t *p_playlist )
{
- char *psz_uri, *psz_homedir =p_playlist->p_vlc->psz_homedir;
+ char *psz_uri, *psz_homedir =p_playlist->p_libvlc->psz_homedir;
input_item_t *p_input;
if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
int playlist_MLDump( playlist_t *p_playlist )
{
- char *psz_uri, *psz_homedir =p_playlist->p_vlc->psz_homedir;
+ char *psz_uri, *psz_homedir =p_playlist->p_libvlc->psz_homedir;
if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS;
if( !psz_homedir )
{
}
p_announce->p_sap = NULL;
-
- vlc_object_attach( p_announce, p_this->p_vlc);
-
+ vlc_object_attach( p_announce, p_this->p_libvlc);
return p_announce;
}
int i_total = 0;
p_access->i_writes++;
p_access->i_sent_bytes += p_buffer->i_buffer;
- if( p_access->p_libvlc->b_stats && p_access->i_writes % 30 == 0 )
+ if( p_access->p_libvlc_global->b_stats && p_access->i_writes % 30 == 0 )
{
/* Access_out -> sout_instance -> input_thread_t */
input_thread_t *p_input =
*pi_height_hint = p_vout->i_window_height;
/* Check whether someone provided us with a window ID */
- var_Get( p_vout->p_vlc, "drawable", &val );
+ var_Get( p_vout->p_libvlc, "drawable", &val );
if( val.i_int ) return (void *)val.i_int;
/* Find if the main interface supports embedding */
#if defined(__APPLE__) || defined(SYS_BEOS)
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
asprintf( &val.psz_string, "%s/Desktop",
- p_vout->p_vlc->psz_homedir );
+ p_vout->p_libvlc->psz_homedir );
}
#elif defined(WIN32) && !defined(UNDER_CE)
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
/* Get the My Pictures folder path */
if( p_mypicturesdir == NULL )
{
asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_vlc->psz_homedir );
+ p_vout->p_libvlc->psz_homedir );
}
else
{
}
#else
- if( !val.psz_string && p_vout->p_vlc->psz_homedir )
+ if( !val.psz_string && p_vout->p_libvlc->psz_homedir )
{
asprintf( &val.psz_string, "%s/" CONFIG_DIR,
- p_vout->p_vlc->psz_homedir );
+ p_vout->p_libvlc->psz_homedir );
}
#endif
if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch )
{
/* There are margins, but with the same width : perfect ! */
- p_this->p_vlc->pf_memcpy(
+ p_this->p_libvlc->pf_memcpy(
p_dest->p[i].p_pixels, p_src->p[i].p_pixels,
p_src->p[i].i_pitch * p_src->p[i].i_visible_lines );
}
for( i_line = p_src->p[i].i_visible_lines; i_line--; )
{
- p_this->p_vlc->pf_memcpy( p_out, p_in,
+ p_this->p_libvlc->pf_memcpy( p_out, p_in,
p_src->p[i].i_visible_pitch );
p_in += p_src->p[i].i_pitch;
p_out += p_dest->p[i].i_pitch;
projects / vlc / commitdiff