_p_class(p_class),
_i_ref(1UL),
_p_libvlc(NULL),
+ _p_mlist(NULL),
+ _p_mplayer(NULL),
+ _i_midx(-1),
_i_codepage(CP_ACP),
_b_usermode(TRUE)
{
SysFreeString(_bstr_mrl);
SysFreeString(_bstr_baseurl);
+ if( _p_mplayer ) { libvlc_media_player_release(_p_mplayer); _p_mplayer=NULL; }
+ if( _p_mlist ) { libvlc_media_list_release(_p_mlist); _p_mlist=NULL; }
+ if( _p_libvlc ) { libvlc_release(_p_libvlc); _p_libvlc=NULL; }
+
_p_class->Release();
};
return S_OK;
};
-HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
+
+void VLCPlugin::initVLC()
{
extern HMODULE DllGetModule();
- if( ! isRunning() )
- {
- /*
- ** default initialization options
- */
- const char *ppsz_argv[32] = { };
- int ppsz_argc = 0;
+ /*
+ ** default initialization options
+ */
+ const char *ppsz_argv[32] = { };
+ int ppsz_argc = 0;
- char p_progpath[MAX_PATH];
+ char p_progpath[MAX_PATH];
+ {
+ TCHAR w_progpath[MAX_PATH];
+ DWORD len = GetModuleFileName(DllGetModule(), w_progpath, MAX_PATH);
+ if( len > 0 )
{
- TCHAR w_progpath[MAX_PATH];
- DWORD len = GetModuleFileName(DllGetModule(), w_progpath, MAX_PATH);
+ len = WideCharToMultiByte(CP_UTF8, 0, w_progpath, len, p_progpath,
+ sizeof(p_progpath)-1, NULL, NULL);
if( len > 0 )
{
- len = WideCharToMultiByte(CP_UTF8, 0, w_progpath, len, p_progpath,
- sizeof(p_progpath)-1, NULL, NULL);
- if( len > 0 )
- {
- p_progpath[len] = '\0';
- ppsz_argv[0] = p_progpath;
- }
+ p_progpath[len] = '\0';
+ ppsz_argv[0] = p_progpath;
}
}
+ }
- ppsz_argv[ppsz_argc++] = "-vv";
+ ppsz_argv[ppsz_argc++] = "-vv";
- HKEY h_key;
- char p_pluginpath[MAX_PATH];
- if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("Software\\VideoLAN\\VLC"),
- 0, KEY_READ, &h_key ) == ERROR_SUCCESS )
+ HKEY h_key;
+ char p_pluginpath[MAX_PATH];
+ if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("Software\\VideoLAN\\VLC"),
+ 0, KEY_READ, &h_key ) == ERROR_SUCCESS )
+ {
+ DWORD i_type, i_data = MAX_PATH;
+ TCHAR w_pluginpath[MAX_PATH];
+ if( RegQueryValueEx( h_key, TEXT("InstallDir"), 0, &i_type,
+ (LPBYTE)w_pluginpath, &i_data ) == ERROR_SUCCESS )
{
- DWORD i_type, i_data = MAX_PATH;
- TCHAR w_pluginpath[MAX_PATH];
- if( RegQueryValueEx( h_key, TEXT("InstallDir"), 0, &i_type,
- (LPBYTE)w_pluginpath, &i_data ) == ERROR_SUCCESS )
+ if( i_type == REG_SZ )
{
- if( i_type == REG_SZ )
+ if( WideCharToMultiByte(CP_UTF8, 0, w_pluginpath, -1, p_pluginpath,
+ sizeof(p_pluginpath)-sizeof("\\plugins")+1, NULL, NULL) )
{
- if( WideCharToMultiByte(CP_UTF8, 0, w_pluginpath, -1, p_pluginpath,
- sizeof(p_pluginpath)-sizeof("\\plugins")+1, NULL, NULL) )
- {
- strcat( p_pluginpath, "\\plugins" );
- ppsz_argv[ppsz_argc++] = "--plugin-path";
- ppsz_argv[ppsz_argc++] = p_pluginpath;
- }
+ strcat( p_pluginpath, "\\plugins" );
+ ppsz_argv[ppsz_argc++] = "--plugin-path";
+ ppsz_argv[ppsz_argc++] = p_pluginpath;
}
}
- RegCloseKey( h_key );
}
+ RegCloseKey( h_key );
+ }
- // make sure plugin isn't affected with VLC single instance mode
- ppsz_argv[ppsz_argc++] = "--no-one-instance";
+ // make sure plugin isn't affected with VLC single instance mode
+ ppsz_argv[ppsz_argc++] = "--no-one-instance";
- /* common settings */
- ppsz_argv[ppsz_argc++] = "--no-stats";
- ppsz_argv[ppsz_argc++] = "--no-media-library";
- ppsz_argv[ppsz_argc++] = "--ignore-config";
- ppsz_argv[ppsz_argc++] = "--intf=dummy";
+ /* common settings */
+ ppsz_argv[ppsz_argc++] = "--no-stats";
+ ppsz_argv[ppsz_argc++] = "--no-media-library";
+ ppsz_argv[ppsz_argc++] = "--ignore-config";
+ ppsz_argv[ppsz_argc++] = "--intf=dummy";
- // loop mode is a configuration option only
- if( _b_autoloop )
- ppsz_argv[ppsz_argc++] = "--loop";
+ // loop mode is a configuration option only
+ if( _b_autoloop )
+ ppsz_argv[ppsz_argc++] = "--loop";
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- _p_libvlc = libvlc_new(ppsz_argc, ppsz_argv, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- *pp_libvlc = NULL;
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ _p_libvlc = libvlc_new(ppsz_argc, ppsz_argv, &ex);
+ if( libvlc_exception_raised(&ex) )
+ return;
- // initial volume setting
- libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
- if( _b_mute )
- {
- libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
- }
+ _p_mlist = libvlc_media_list_new(_p_libvlc, &ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ libvlc_release(_p_libvlc);
+ return;
+ }
- // initial playlist item
- if( SysStringLen(_bstr_mrl) > 0 )
- {
- char *psz_mrl = NULL;
+ // initial volume setting
+ libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
+ if( _b_mute )
+ {
+ libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
+ }
- if( SysStringLen(_bstr_baseurl) > 0 )
+ // initial playlist item
+ if( SysStringLen(_bstr_mrl) > 0 )
+ {
+ char *psz_mrl = NULL;
+
+ if( SysStringLen(_bstr_baseurl) > 0 )
+ {
+ /*
+ ** if the MRL a relative URL, we should end up with an absolute URL
+ */
+ LPWSTR abs_url = CombineURL(_bstr_baseurl, _bstr_mrl);
+ if( NULL != abs_url )
{
- /*
- ** if the MRL a relative URL, we should end up with an absolute URL
- */
- LPWSTR abs_url = CombineURL(_bstr_baseurl, _bstr_mrl);
- if( NULL != abs_url )
- {
- psz_mrl = CStrFromWSTR(CP_UTF8, abs_url, wcslen(abs_url));
- CoTaskMemFree(abs_url);
- }
- else
- {
- psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
- }
+ psz_mrl = CStrFromWSTR(CP_UTF8, abs_url, wcslen(abs_url));
+ CoTaskMemFree(abs_url);
}
else
{
- /*
- ** baseURL is empty, assume MRL is absolute
- */
psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
}
- if( NULL != psz_mrl )
- {
- const char *options[1];
- int i_options = 0;
+ }
+ else
+ {
+ /*
+ ** baseURL is empty, assume MRL is absolute
+ */
+ psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
+ }
+ if( NULL != psz_mrl )
+ {
+ const char *options[1];
+ int i_options = 0;
- char timeBuffer[32];
- if( _i_time )
- {
- snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time);
- options[i_options++] = timeBuffer;
- }
- // add default target to playlist
- libvlc_playlist_add_extended_untrusted(_p_libvlc, psz_mrl, NULL, i_options, options, NULL);
- CoTaskMemFree(psz_mrl);
+ char timeBuffer[32];
+ if( _i_time )
+ {
+ snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time);
+ options[i_options++] = timeBuffer;
}
+ // add default target to playlist
+ playlist_add_extended_untrusted(psz_mrl, i_options, options, NULL);
+ CoTaskMemFree(psz_mrl);
}
}
- *pp_libvlc = _p_libvlc;
- return S_OK;
};
void VLCPlugin::setErrorInfo(REFIID riid, const char *description)
libvlc_video_set_parent(p_libvlc,
reinterpret_cast<libvlc_drawable_t>(_inplacewnd), NULL);
- if( _b_autoplay )
+ if( _b_autoplay && playlist_select(0,NULL) )
{
- libvlc_playlist_lock(p_libvlc);
- unsigned count = libvlc_playlist_items_count(p_libvlc, &ex);
- if( count > 0 )
- {
- libvlc_playlist_play(p_libvlc, 0, 0, NULL, NULL);
- fireOnPlayEvent();
- }
- libvlc_playlist_unlock(p_libvlc);
+ libvlc_media_player_play(_p_mplayer,NULL);
+ fireOnPlayEvent();
}
}
HRESULT VLCPlugin::onInPlaceDeactivate(void)
{
- if( isRunning() )
+ if( isPlaying(NULL) )
{
- libvlc_playlist_stop(_p_libvlc, NULL);
+ playlist_stop(NULL);
fireOnStopEvent();
}
if( seconds != _i_time )
{
setStartTime(_i_time);
- if( isRunning() )
+ if( NULL != _p_mplayer )
{
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(_p_libvlc, NULL);
- if( NULL != p_md )
- {
- libvlc_media_player_set_time(p_md, _i_time, NULL);
- libvlc_media_player_release(p_md);
- }
+ libvlc_media_player_set_time(_p_mplayer, _i_time, NULL);
}
}
};
DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
vlcConnectionPointContainer->fireEvent(DISPID_StopEvent, &dispparamsNoArgs);
};
+
+bool VLCPlugin::playlist_select( int idx, libvlc_exception_t *ex )
+{
+ libvlc_media_t *p_m = NULL;
+
+ libvlc_media_list_lock(_p_mlist);
+
+ int count = libvlc_media_list_count(_p_mlist,ex);
+ if( libvlc_exception_raised(ex) )
+ goto bad_unlock;
+
+ if( idx<0||idx>=count )
+ goto bad_unlock;
+
+ _i_midx = idx;
+
+ p_m = libvlc_media_list_item_at_index(_p_mlist,_i_midx,ex);
+ libvlc_media_list_unlock(_p_mlist);
+
+ if( libvlc_exception_raised(ex) )
+ return false;
+
+ if( _p_mplayer )
+ {
+ libvlc_media_player_release( _p_mplayer );
+ _p_mplayer = NULL;
+ }
+
+ _p_mplayer = libvlc_media_player_new_from_media(p_m,ex);
+ if( _p_mplayer )
+ set_player_window(ex);
+
+ libvlc_media_release( p_m );
+ return !libvlc_exception_raised(ex);
+
+bad_unlock:
+ libvlc_media_list_unlock(_p_mlist);
+ return false;
+}
+
+void VLCPlugin::set_player_window(libvlc_exception_t *ex)
+{
+ // XXX FIXME no idea if this is correct or not
+ libvlc_media_player_set_hwnd(_p_mplayer,getInPlaceWindow(),ex);
+}
+
+int VLCPlugin::playlist_add_extended_untrusted(const char *mrl, int optc, const char **optv, libvlc_exception_t *ex)
+{
+ int item = -1;
+ libvlc_media_t *p_m = libvlc_media_new(_p_libvlc,mrl,ex);
+ if( libvlc_exception_raised(ex) )
+ return -1;
+
+ for( int i = 0; i < optc; ++i )
+ {
+ libvlc_media_add_option_untrusted(p_m, optv[i],ex);
+ if( libvlc_exception_raised(ex) )
+ {
+ libvlc_media_release(p_m);
+ return -1;
+ }
+ }
+
+ libvlc_media_list_lock(_p_mlist);
+ libvlc_media_list_add_media(_p_mlist,p_m,ex);
+ if( !libvlc_exception_raised(ex) )
+ item = libvlc_media_list_count(_p_mlist,ex)-1;
+ libvlc_media_list_unlock(_p_mlist);
+ libvlc_media_release(p_m);
+
+ return item;
+}
+
+
STDMETHODIMP VLCControl::play(void)
{
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(result) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_play(p_libvlc, -1, 0, NULL, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCControl,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- _p_instance->fireOnPlayEvent();
- return NOERROR;
+ _p_instance->playlist_play(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCControl,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return result;
+ _p_instance->fireOnPlayEvent();
+ return NOERROR;
};
STDMETHODIMP VLCControl::pause(void)
{
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t* p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_pause(p_libvlc, &ex);
+ libvlc_media_player_pause(p_md, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
STDMETHODIMP VLCControl::stop(void)
{
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_stop(p_libvlc, &ex);
+ libvlc_media_player_stop(p_md, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
if( NULL == isPlaying )
return E_POINTER;
- HRESULT result = NOERROR;
- if( _p_instance->isRunning() )
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
+ if( SUCCEEDED(result) )
{
- libvlc_instance_t *p_libvlc;
- result = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(result) )
- {
- libvlc_playlist_lock( p_libvlc );
- if( libvlc_playlist_isplaying(p_libvlc, NULL) )
- *isPlaying = VARIANT_TRUE;
- else
- *isPlaying = VARIANT_FALSE;
- libvlc_playlist_unlock( p_libvlc );
- return NOERROR;
- }
+ *isPlaying = libvlc_media_player_is_playing(p_md, NULL) ?
+ VARIANT_TRUE : VARIANT_FALSE;
+ return NOERROR;
}
*isPlaying = VARIANT_FALSE;
return result;
return E_POINTER;
*position = 0.0f;
- libvlc_instance_t* p_libvlc;
- HRESULT result = E_UNEXPECTED;
- result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
- if( !libvlc_exception_raised(&ex) )
+ *position = libvlc_media_player_get_position(p_md, &ex);
+ if( ! libvlc_exception_raised(&ex) )
{
- *position = libvlc_media_player_get_position(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCControl::put_Position(float position)
{
- HRESULT result = E_UNEXPECTED;
- libvlc_instance_t* p_libvlc;
- result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_media_player_set_position(p_md, position, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_player_set_position(p_md, position, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
return E_POINTER;
*seconds = 0;
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *seconds = libvlc_media_player_get_time(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *seconds = libvlc_media_player_get_time(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCControl::shuttle(int seconds)
{
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ if( seconds < 0 ) seconds = 0;
+ libvlc_media_player_set_time(p_md, (int64_t)seconds, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- if( seconds < 0 ) seconds = 0;
- libvlc_media_player_set_time(p_md, (int64_t)seconds, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCControl::fullscreen(void)
{
- HRESULT result = E_UNEXPECTED;
- if( _p_instance->isRunning() )
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
+ if( SUCCEEDED(result) )
{
- libvlc_instance_t *p_libvlc;
- result = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(result) )
+ if( libvlc_media_player_is_playing(p_md, NULL) )
{
- bool b_playing;
- libvlc_playlist_lock( p_libvlc );
- b_playing = libvlc_playlist_isplaying(p_libvlc, NULL);
- libvlc_playlist_unlock( p_libvlc );
- if( b_playing )
- {
- libvlc_media_player_t *p_md =
- libvlc_playlist_get_media_player(p_libvlc, NULL);
- if( p_md )
- {
- libvlc_toggle_fullscreen(p_md, NULL);
- libvlc_media_player_release(p_md);
- }
- }
+ libvlc_toggle_fullscreen(p_md, NULL);
}
}
return result;
return E_POINTER;
*seconds = 0;
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *seconds = (double)libvlc_media_player_get_length(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *seconds = (double)libvlc_media_player_get_length(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
{
int32_t rate = 2;
- HRESULT result = E_UNEXPECTED;
- if( !_p_instance->isRunning() )
- return result;
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
- libvlc_instance_t* p_libvlc;
- result = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
libvlc_media_player_set_rate(p_md, rate, &ex);
- libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
{
float rate = 0.5;
- HRESULT result = E_UNEXPECTED;
- if( !_p_instance->isRunning() )
- return result;
-
- libvlc_instance_t* p_libvlc;
- result = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_media_player_set_rate(p_md, rate, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_player_set_rate(p_md, rate, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_get_message(&ex));
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- position = libvlc_playlist_add_extended(p_libvlc, cUri, cUri,
- cOptionsCount,
- const_cast<const char**>(cOptions),
- &ex);
+ position = _p_instance->playlist_add_extended_untrusted(cUri,
+ cOptionsCount, const_cast<const char**>(cOptions), &ex);
FreeTargetOptions(cOptions, cOptionsCount);
CoTaskMemFree(cUri);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- *index = libvlc_playlist_get_current_index(p_libvlc, &ex);
+ *index = _p_instance->playlist_get_current_index(&ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
if( NULL == count )
return E_POINTER;
- *count = 0;
- libvlc_instance_t* p_libvlc;
- HRESULT result = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(result) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_lock(p_libvlc);
- *count = libvlc_playlist_items_count(p_libvlc, &ex);
- libvlc_playlist_unlock(p_libvlc);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCControl,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ *count = _p_instance->playlist_count(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCControl,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return result;
+ return NOERROR;
};
STDMETHODIMP VLCControl::playlistNext(void)
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_next(p_libvlc, &ex);
+ _p_instance->playlist_next(&ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_prev(p_libvlc, &ex);
+ _p_instance->playlist_prev(&ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_clear(p_libvlc, &ex);
+ _p_instance->playlist_clear(&ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCControl,
if( NULL == track )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t* p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
*track = libvlc_audio_get_track(p_md, &ex);
- libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCAudio,
STDMETHODIMP VLCAudio::put_track(long track)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_audio_set_track(p_md, track, &ex);
- libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCAudio,
return E_POINTER;
*length = 0;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *length = (double)libvlc_media_player_get_length(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *length = (double)libvlc_media_player_get_length(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
return E_POINTER;
*position = 0.0f;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *position = libvlc_media_player_get_position(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *position = libvlc_media_player_get_position(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCInput::put_position(double position)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_media_player_set_position(p_md, position, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_player_set_position(p_md, position, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
if( NULL == time )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *time = (double)libvlc_media_player_get_time(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *time = (double)libvlc_media_player_get_time(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCInput::put_time(double time)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_media_player_set_time(p_md, (int64_t)time, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_player_set_time(p_md, (int64_t)time, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
if( NULL == state )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *state = libvlc_media_player_get_state(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *state = libvlc_media_player_get_state(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
libvlc_exception_clear(&ex);
// don't fail, just return the idle state
if( NULL == rate )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *rate = libvlc_media_player_get_rate(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *rate = libvlc_media_player_get_rate(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
STDMETHODIMP VLCInput::put_rate(double rate)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_media_player_set_rate(p_md, rate, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_player_set_rate(p_md, rate, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
return E_POINTER;
*fps = 0.0;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *fps = libvlc_media_player_get_fps(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *fps = libvlc_media_player_get_fps(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
if( NULL == hasVout )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md;
- p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *hasVout = libvlc_media_player_has_vout(p_md, &ex) ?
+ VARIANT_TRUE : VARIANT_FALSE;
if( ! libvlc_exception_raised(&ex) )
{
- *hasVout = libvlc_media_player_has_vout(p_md, &ex) ?
- VARIANT_TRUE : VARIANT_FALSE;
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCInput,
libvlc_exception_get_message(&ex));
if( NULL == count )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_lock(p_libvlc);
- *count = libvlc_playlist_items_count(p_libvlc, &ex);
- libvlc_playlist_unlock(p_libvlc);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylistItems,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ *count = _p_instance->playlist_count(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylistItems,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylistItems::clear()
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_clear(p_libvlc, &ex);
+ _p_instance->playlist_clear(&ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCPlaylistItems,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_delete_item(p_libvlc, item, &ex);
+ _p_instance->playlist_delete_item(item, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCPlaylistItems,
return E_POINTER;
*count = 0;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_lock(p_libvlc);
- *count = libvlc_playlist_items_count(p_libvlc, &ex);
- libvlc_playlist_unlock(p_libvlc);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylist,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ *count = _p_instance->playlist_count(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylist,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::get_isPlaying(VARIANT_BOOL* isPlaying)
if( NULL == isPlaying )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_lock( p_libvlc );
- *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ?
+ *isPlaying = libvlc_media_player_is_playing(p_md, &ex) ?
VARIANT_TRUE: VARIANT_FALSE;
if( libvlc_exception_raised(&ex) )
{
- libvlc_playlist_unlock( p_libvlc );
_p_instance->setErrorInfo(IID_IVLCPlaylist,
libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
return E_FAIL;
}
- libvlc_playlist_unlock( p_libvlc );
return NOERROR;
}
return hr;
VariantClear(&v_name);
}
- *item = libvlc_playlist_add_extended(p_libvlc,
- psz_uri,
- psz_name,
- i_options,
- const_cast<const char **>(ppsz_options),
- &ex);
+ *item = _p_instance->playlist_add_extended_untrusted(psz_uri,
+ i_options, const_cast<const char **>(ppsz_options), &ex);
VLCControl::FreeTargetOptions(ppsz_options, i_options);
CoTaskMemFree(psz_uri);
STDMETHODIMP VLCPlaylist::play()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_play(p_libvlc, -1, 0, NULL, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ _p_instance->playlist_play(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::playItem(long item)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_play(p_libvlc, item, 0, NULL, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylist,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ _p_instance->playlist_play_item(item,&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylist,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::togglePause()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t* p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_pause(p_libvlc, &ex);
+ libvlc_media_player_pause(p_md, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCPlaylist,
STDMETHODIMP VLCPlaylist::stop()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_stop(p_libvlc, &ex);
+ libvlc_media_player_stop(p_md, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCPlaylist,
STDMETHODIMP VLCPlaylist::next()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_next(p_libvlc, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylist,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ _p_instance->playlist_next(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylist,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::prev()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_prev(p_libvlc, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylist,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ _p_instance->playlist_prev(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylist,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::clear()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
- if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
- libvlc_playlist_clear(p_libvlc, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCPlaylist,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ _p_instance->playlist_clear(&ex);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCPlaylist,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
- return hr;
+ return NOERROR;
};
STDMETHODIMP VLCPlaylist::removeItem(long item)
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_playlist_delete_item(p_libvlc, item, &ex);
+ _p_instance->playlist_delete_item(item, &ex);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCPlaylist,
if( NULL == fullscreen )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *fullscreen = libvlc_get_fullscreen(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
if( ! libvlc_exception_raised(&ex) )
{
- *fullscreen = libvlc_get_fullscreen(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
STDMETHODIMP VLCVideo::put_fullscreen(VARIANT_BOOL fullscreen)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_set_fullscreen(p_md, VARIANT_FALSE != fullscreen, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_set_fullscreen(p_md, VARIANT_FALSE != fullscreen, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
if( NULL == width )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *width = libvlc_video_get_width(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *width = libvlc_video_get_width(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
if( NULL == height )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *height = libvlc_video_get_height(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *height = libvlc_video_get_height(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
if( NULL == aspect )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ char *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);
+
if( ! libvlc_exception_raised(&ex) )
{
- char *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);
-
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- if( NULL == psz_aspect )
- return E_OUTOFMEMORY;
+ if( NULL == psz_aspect )
+ return E_OUTOFMEMORY;
- *aspect = BSTRFromCStr(CP_UTF8, psz_aspect);
- free( psz_aspect );
- psz_aspect = NULL;
- return (NULL == *aspect) ? E_OUTOFMEMORY : NOERROR;
- }
+ *aspect = BSTRFromCStr(CP_UTF8, psz_aspect);
free( psz_aspect );
psz_aspect = NULL;
+ return (NULL == *aspect) ? E_OUTOFMEMORY : NOERROR;
}
+ free( psz_aspect );
+ psz_aspect = NULL;
+
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
return E_FAIL;
if( 0 == SysStringLen(aspect) )
return E_INVALIDARG;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
- if( ! libvlc_exception_raised(&ex) )
+ char *psz_aspect = CStrFromBSTR(CP_UTF8, aspect);
+ if( NULL == psz_aspect )
{
- char *psz_aspect = CStrFromBSTR(CP_UTF8, aspect);
- if( NULL == psz_aspect )
- {
- return E_OUTOFMEMORY;
- }
+ return E_OUTOFMEMORY;
+ }
- libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);
+ libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);
- CoTaskMemFree(psz_aspect);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCVideo,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ CoTaskMemFree(psz_aspect);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCVideo,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
return NOERROR;
}
if( NULL == spu )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *spu = libvlc_video_get_spu(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *spu = libvlc_video_get_spu(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
STDMETHODIMP VLCVideo::put_subtitle(long spu)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_video_set_spu(p_md, spu, &ex);
- libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
if( NULL == geometry )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ char *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);
+
if( ! libvlc_exception_raised(&ex) )
{
- char *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);
-
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- if( NULL == psz_geometry )
- return E_OUTOFMEMORY;
+ if( NULL == psz_geometry )
+ return E_OUTOFMEMORY;
- *geometry = BSTRFromCStr(CP_UTF8, psz_geometry);
- free( psz_geometry );
- psz_geometry = NULL;
- return (NULL == geometry) ? E_OUTOFMEMORY : NOERROR;
- }
+ *geometry = BSTRFromCStr(CP_UTF8, psz_geometry);
free( psz_geometry );
psz_geometry = NULL;
+ return (NULL == geometry) ? E_OUTOFMEMORY : NOERROR;
}
+ free( psz_geometry );
+ psz_geometry = NULL;
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
return E_FAIL;
if( 0 == SysStringLen(geometry) )
return E_INVALIDARG;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
- if( ! libvlc_exception_raised(&ex) )
+ char *psz_geometry = CStrFromBSTR(CP_UTF8, geometry);
+ if( NULL == psz_geometry )
{
- char *psz_geometry = CStrFromBSTR(CP_UTF8, geometry);
- if( NULL == psz_geometry )
- {
- return E_OUTOFMEMORY;
- }
+ return E_OUTOFMEMORY;
+ }
- libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);
+ libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);
- CoTaskMemFree(psz_geometry);
- libvlc_media_player_release(p_md);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCVideo,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ CoTaskMemFree(psz_geometry);
+ if( libvlc_exception_raised(&ex) )
+ {
+ _p_instance->setErrorInfo(IID_IVLCVideo,
+ libvlc_exception_get_message(&ex));
+ libvlc_exception_clear(&ex);
+ return E_FAIL;
}
return NOERROR;
}
if( NULL == page )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ *page = libvlc_video_get_teletext(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *page = libvlc_video_get_teletext(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
STDMETHODIMP VLCVideo::put_teletext(long page)
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_video_set_teletext(p_md, page, &ex);
- libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
if( NULL == picture )
return E_POINTER;
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
- if( ! libvlc_exception_raised(&ex) )
- {
- static int uniqueId = 0;
- TCHAR path[MAX_PATH+1];
+ static int uniqueId = 0;
+ TCHAR path[MAX_PATH+1];
- int pathlen = GetTempPath(MAX_PATH-24, path);
- if( (0 == pathlen) || (pathlen > (MAX_PATH-24)) )
- return E_FAIL;
+ int pathlen = GetTempPath(MAX_PATH-24, path);
+ if( (0 == pathlen) || (pathlen > (MAX_PATH-24)) )
+ return E_FAIL;
- /* check temp directory path by openning it */
+ /* check temp directory path by openning it */
+ {
+ HANDLE dirHandle = CreateFile(path, GENERIC_READ,
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+ NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+ if( INVALID_HANDLE_VALUE == dirHandle )
+ {
+ _p_instance->setErrorInfo(IID_IVLCVideo,
+ "Invalid temporary directory for snapshot images, check values of TMP, TEMP envars.");
+ return E_FAIL;
+ }
+ else
{
- HANDLE dirHandle = CreateFile(path,
- GENERIC_READ,
- FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
- NULL,
- OPEN_EXISTING,
- FILE_FLAG_BACKUP_SEMANTICS, NULL);
- if( INVALID_HANDLE_VALUE == dirHandle )
+ BY_HANDLE_FILE_INFORMATION bhfi;
+ BOOL res = GetFileInformationByHandle(dirHandle, &bhfi);
+ CloseHandle(dirHandle);
+ if( !res || !(bhfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
{
_p_instance->setErrorInfo(IID_IVLCVideo,
"Invalid temporary directory for snapshot images, check values of TMP, TEMP envars.");
return E_FAIL;
}
- else
- {
- BY_HANDLE_FILE_INFORMATION bhfi;
- BOOL res = GetFileInformationByHandle(dirHandle, &bhfi);
- CloseHandle(dirHandle);
- if( !res || !(bhfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
- {
- _p_instance->setErrorInfo(IID_IVLCVideo,
- "Invalid temporary directory for snapshot images, check values of TMP, TEMP envars.");
- return E_FAIL;
- }
- }
}
+ }
- TCHAR filepath[MAX_PATH+1];
+ TCHAR filepath[MAX_PATH+1];
- _stprintf(filepath, TEXT("%sAXVLC%lXS%lX.bmp"),
- path, GetCurrentProcessId(), ++uniqueId);
+ _stprintf(filepath, TEXT("%sAXVLC%lXS%lX.bmp"),
+ path, GetCurrentProcessId(), ++uniqueId);
#ifdef _UNICODE
- /* reuse path storage for UTF8 string */
- char *psz_filepath = (char *)path;
- WCHAR* wpath = filepath;
+ /* reuse path storage for UTF8 string */
+ char *psz_filepath = (char *)path;
+ WCHAR* wpath = filepath;
#else
- char *psz_filepath = path;
- /* first convert to unicode using current code page */
- WCHAR wpath[MAX_PATH+1];
- if( 0 == MultiByteToWideChar(CP_ACP, 0, filepath, -1, wpath, sizeof(wpath)/sizeof(WCHAR)) )
- return E_FAIL;
+ char *psz_filepath = path;
+ /* first convert to unicode using current code page */
+ WCHAR wpath[MAX_PATH+1];
+ if( 0 == MultiByteToWideChar(CP_ACP, 0, filepath, -1, wpath, sizeof(wpath)/sizeof(WCHAR)) )
+ return E_FAIL;
#endif
- /* convert to UTF8 */
- pathlen = WideCharToMultiByte(CP_UTF8, 0, wpath, -1, psz_filepath, sizeof(path), NULL, NULL);
- // fail if path is 0 or too short (i.e pathlen is the same as storage size)
- if( (0 == pathlen) || (sizeof(path) == pathlen) )
- return E_FAIL;
+ /* convert to UTF8 */
+ pathlen = WideCharToMultiByte(CP_UTF8, 0, wpath, -1, psz_filepath, sizeof(path), NULL, NULL);
+ // fail if path is 0 or too short (i.e pathlen is the same as storage size)
+ if( (0 == pathlen) || (sizeof(path) == pathlen) )
+ return E_FAIL;
- /* take snapshot into file */
- libvlc_video_take_snapshot(p_md, psz_filepath, 0, 0, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
+ /* take snapshot into file */
+ libvlc_video_take_snapshot(p_md, psz_filepath, 0, 0, &ex);
+ if( ! libvlc_exception_raised(&ex) )
+ {
+ hr = E_FAIL;
+ /* open snapshot file */
+ HANDLE snapPic = LoadImage(NULL, filepath, IMAGE_BITMAP,0, 0, LR_CREATEDIBSECTION|LR_LOADFROMFILE);
+ if( snapPic )
{
- hr = E_FAIL;
- /* open snapshot file */
- HANDLE snapPic = LoadImage(NULL, filepath, IMAGE_BITMAP,0, 0, LR_CREATEDIBSECTION|LR_LOADFROMFILE);
- if( snapPic )
+ PICTDESC snapDesc;
+
+ snapDesc.cbSizeofstruct = sizeof(PICTDESC);
+ snapDesc.picType = PICTYPE_BITMAP;
+ snapDesc.bmp.hbitmap = (HBITMAP)snapPic;
+ snapDesc.bmp.hpal = NULL;
+
+ hr = OleCreatePictureIndirect(&snapDesc, IID_IPictureDisp, TRUE, (LPVOID*)picture);
+ if( FAILED(hr) )
{
- PICTDESC snapDesc;
-
- snapDesc.cbSizeofstruct = sizeof(PICTDESC);
- snapDesc.picType = PICTYPE_BITMAP;
- snapDesc.bmp.hbitmap = (HBITMAP)snapPic;
- snapDesc.bmp.hpal = NULL;
-
- hr = OleCreatePictureIndirect(&snapDesc, IID_IPictureDisp, TRUE, (LPVOID*)picture);
- if( FAILED(hr) )
- {
- *picture = NULL;
- DeleteObject(snapPic);
- }
+ *picture = NULL;
+ DeleteObject(snapPic);
}
- DeleteFile(filepath);
- return hr;
}
+ DeleteFile(filepath);
+ return hr;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
STDMETHODIMP VLCVideo::toggleFullscreen()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_toggle_fullscreen(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_toggle_fullscreen(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);
STDMETHODIMP VLCVideo::toggleTeletext()
{
- libvlc_instance_t* p_libvlc;
- HRESULT hr = _p_instance->getVLC(&p_libvlc);
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
{
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
+ libvlc_toggle_teletext(p_md, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_toggle_teletext(p_md, &ex);
- libvlc_media_player_release(p_md);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
+ return NOERROR;
}
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_clear(&ex);