{
if( libvlc_exception_raised(ex) )
{
- p->setErrorInfo(riid,libvlc_exception_get_message(ex));
+ p->setErrorInfo(riid,libvlc_errmsg());
libvlc_exception_clear(ex);
return E_FAIL;
}
EMIT_EXCEPTION_BRIDGE( VLCAudio )
EMIT_EXCEPTION_BRIDGE( VLCInput )
+EMIT_EXCEPTION_BRIDGE( VLCMarquee )
EMIT_EXCEPTION_BRIDGE( VLCMessageIterator )
EMIT_EXCEPTION_BRIDGE( VLCMessages )
EMIT_EXCEPTION_BRIDGE( VLCLog )
EMIT_EXCEPTION_BRIDGE( VLCPlaylistItems )
EMIT_EXCEPTION_BRIDGE( VLCPlaylist )
EMIT_EXCEPTION_BRIDGE( VLCVideo )
+EMIT_EXCEPTION_BRIDGE( VLCSubtitle )
#undef EMIT_EXCEPTION_BRIDGE
libvlc_exception_init(&ex);
// get the number of audio track available and return it
*trackNumber = libvlc_audio_get_track_count(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCAudio,
- libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ hr = exception_bridge(&ex);
}
return hr;
};
// get tracks description
p_trackDesc = libvlc_audio_get_track_description(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ hr = exception_bridge(&ex);
+ if( FAILED(hr) )
+ return hr;
//get the number of available track
i_limit = libvlc_audio_get_track_count(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ hr = exception_bridge(&ex);
+ if( FAILED(hr) )
+ return hr;
// check if the number given is a good one
if ( ( trackID > ( i_limit -1 ) ) || ( trackID < 0 ) )
libvlc_exception_init(&ex);
*state = libvlc_media_player_get_state(p_md, &ex);
- if( ! libvlc_exception_raised(&ex) )
+ if( libvlc_exception_raised(&ex) )
{
- return NOERROR;
+ // don't fail, just return the idle state
+ *state = 0;
+ libvlc_exception_clear(&ex);
}
- libvlc_exception_clear(&ex);
- // don't fail, just return the idle state
- *state = 0;
- return NOERROR;
}
return hr;
};
{
delete _p_vlcmessages;
if( _p_log )
- libvlc_log_close(_p_log, NULL);
+ libvlc_log_close(_p_log);
if( _p_typeinfo )
_p_typeinfo->Release();
libvlc_instance_t* p_libvlc;
HRESULT hr = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(hr) )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *level = libvlc_get_log_verbosity(p_libvlc, &ex);
- hr = exception_bridge(&ex);
- }
+ *level = libvlc_get_log_verbosity(p_libvlc);
return hr;
}
else
hr = exception_bridge(&ex);
}
if( SUCCEEDED(hr) )
- libvlc_set_log_verbosity(p_libvlc, (unsigned)verbosity, &ex);
+ libvlc_set_log_verbosity(p_libvlc, (unsigned)verbosity);
}
else if( _p_log )
{
/* close log when verbosity is set to -1 */
- libvlc_log_close(_p_log, &ex);
+ libvlc_log_close(_p_log);
_p_log = NULL;
}
hr = exception_bridge(&ex);
/*******************************************************************************/
+VLCMarquee::~VLCMarquee()
+{
+ if( _p_typeinfo )
+ _p_typeinfo->Release();
+};
+
+HRESULT VLCMarquee::loadTypeInfo(void)
+{
+ HRESULT hr = NOERROR;
+ if( NULL == _p_typeinfo )
+ {
+ ITypeLib *p_typelib;
+
+ hr = _p_instance->getTypeLib(LOCALE_USER_DEFAULT, &p_typelib);
+ if( SUCCEEDED(hr) )
+ {
+ hr = p_typelib->GetTypeInfoOfGuid(IID_IVLCMarquee, &_p_typeinfo);
+ if( FAILED(hr) )
+ {
+ _p_typeinfo = NULL;
+ }
+ p_typelib->Release();
+ }
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::GetTypeInfoCount(UINT* pctInfo)
+{
+ if( NULL == pctInfo )
+ return E_INVALIDARG;
+
+ if( SUCCEEDED(loadTypeInfo()) )
+ *pctInfo = 1;
+ else
+ *pctInfo = 0;
+
+ return NOERROR;
+};
+
+STDMETHODIMP VLCMarquee::GetTypeInfo(UINT iTInfo, LCID lcid, LPTYPEINFO* ppTInfo)
+{
+ if( NULL == ppTInfo )
+ return E_INVALIDARG;
+
+ if( SUCCEEDED(loadTypeInfo()) )
+ {
+ _p_typeinfo->AddRef();
+ *ppTInfo = _p_typeinfo;
+ return NOERROR;
+ }
+ *ppTInfo = NULL;
+ return E_NOTIMPL;
+};
+
+STDMETHODIMP VLCMarquee::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames,
+ UINT cNames, LCID lcid, DISPID* rgDispID)
+{
+ if( SUCCEEDED(loadTypeInfo()) )
+ {
+ return DispGetIDsOfNames(_p_typeinfo, rgszNames, cNames, rgDispID);
+ }
+ return E_NOTIMPL;
+};
+
+STDMETHODIMP VLCMarquee::Invoke(DISPID dispIdMember, REFIID riid,
+ LCID lcid, WORD wFlags, DISPPARAMS* pDispParams,
+ VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
+{
+ if( SUCCEEDED(loadTypeInfo()) )
+ {
+ return DispInvoke(this, _p_typeinfo, dispIdMember, wFlags, pDispParams,
+ pVarResult, pExcepInfo, puArgErr);
+ }
+ return E_NOTIMPL;
+};
+
+STDMETHODIMP VLCMarquee::enable()
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Enabled, true, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::disable()
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Enabled, false, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::color(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Color, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::opacity(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Opacity, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::position(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Position, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::refresh(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Refresh, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::size(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Size, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::text(BSTR text)
+{
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
+ if( SUCCEEDED(hr) )
+ {
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+
+ char *psz_text = CStrFromBSTR(CP_UTF8, text);
+ libvlc_video_set_marquee_option_as_string(p_md, libvlc_marquee_Text, psz_text, &ex);
+ hr = exception_bridge(&ex);
+ CoTaskMemFree(psz_text);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::timeout(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Timeout, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::x(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_X, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCMarquee::y(long val)
+{
+ 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_video_set_marquee_option_as_int(p_md, libvlc_marquee_Y, val, &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+/*******************************************************************************/
+
/* STL forward iterator used by VLCEnumIterator class to implement IEnumVARIANT */
class VLCMessageSTLIterator
STDMETHODIMP VLCMessages::clear()
{
- HRESULT hr = NOERROR;
libvlc_log_t *p_log = _p_vlclog->_p_log;
if( p_log )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_log_clear(p_log, &ex);
- hr = exception_bridge(&ex);
- }
- return hr;
+ libvlc_log_clear(p_log);
+ return NOERROR;
};
STDMETHODIMP VLCMessages::get_count(long* count)
{
- HRESULT hr = S_OK;
-
if( NULL == count )
return E_POINTER;
libvlc_log_t *p_log = _p_vlclog->_p_log;
- if( p_log )
- {
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *count = libvlc_log_count(p_log, &ex);
- hr = exception_bridge(&ex);
- }
- else
- *count = 0;
- return hr;
+ *count = libvlc_log_count(p_log);
+ return S_OK;
};
STDMETHODIMP VLCMessages::iterator(IVLCMessageIterator** iter)
VLCMessageIterator::~VLCMessageIterator()
{
if( _p_iter )
- libvlc_log_iterator_free(_p_iter, NULL);
+ libvlc_log_iterator_free(_p_iter);
if( _p_typeinfo )
_p_typeinfo->Release();
STDMETHODIMP VLCMessageIterator::get_hasNext(VARIANT_BOOL* hasNext)
{
- HRESULT hr = S_OK;
-
if( NULL == hasNext )
return E_POINTER;
if( _p_iter && _p_vlclog->_p_log )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *hasNext = libvlc_log_iterator_has_next(_p_iter, &ex) ?
+ *hasNext = libvlc_log_iterator_has_next(_p_iter) ?
VARIANT_TRUE : VARIANT_FALSE;
- hr = exception_bridge(&ex);
}
else
{
*hasNext = VARIANT_FALSE;
}
- return hr;
+ return S_OK;
};
STDMETHODIMP VLCMessageIterator::next(IVLCMessage** message)
buffer.sizeof_msg = sizeof(buffer);
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_log_iterator_next(_p_iter, &buffer, &ex);
- hr = exception_bridge(&ex);
- if( SUCCEEDED(hr) )
- {
- *message = new VLCMessage(_p_instance, buffer);
- if( !message )
- hr = E_OUTOFMEMORY;
- }
+ libvlc_log_iterator_next(_p_iter, &buffer);
+ *message = new VLCMessage(_p_instance, buffer);
+ if( !message )
+ hr = E_OUTOFMEMORY;
}
return hr;
};
libvlc_exception_init(&ex);
*spu = libvlc_video_get_spu(p_md, &ex);
- if( ! libvlc_exception_raised(&ex) )
- {
- return NOERROR;
- }
- _p_instance->setErrorInfo(IID_IVLCSubtitle, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
+ hr = exception_bridge(&ex);
}
return hr;
};
libvlc_exception_init(&ex);
libvlc_video_set_spu(p_md, spu, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCSubtitle, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ hr = exception_bridge(&ex);
}
return hr;
};
libvlc_exception_init(&ex);
// get the number of video subtitle available and return it
*spuNumber = libvlc_video_get_spu_count(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCSubtitle, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
- return NOERROR;
+ hr = exception_bridge(&ex);
}
return hr;
};
// get subtitles description
p_spuDesc = libvlc_video_get_spu_description(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCSubtitle, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ hr = exception_bridge(&ex);
+ if( FAILED(hr) )
+ return hr;
// get the number of available subtitle
i_limit = libvlc_video_get_spu_count(p_md, &ex);
- if( libvlc_exception_raised(&ex) )
- {
- _p_instance->setErrorInfo(IID_IVLCSubtitle, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
- }
+ hr = exception_bridge(&ex);
+ if( FAILED(hr) )
+ return hr;
// check if the number given is a good one
if ( ( nameID > ( i_limit -1 ) ) || ( nameID < 0 ) )
VLCVideo::~VLCVideo()
{
+ delete _p_vlcmarquee;
if( _p_typeinfo )
_p_typeinfo->Release();
};
if( NULL == aspect )
return E_POINTER;
- if( 0 == SysStringLen(aspect) )
- return E_INVALIDARG;
-
libvlc_media_player_t *p_md;
HRESULT hr = _p_instance->getMD(&p_md);
if( SUCCEEDED(hr) )
return hr;
};
+STDMETHODIMP VLCVideo::deinterlaceDisable()
+{
+ 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_video_set_deinterlace(p_md, 0, "", &ex);
+ hr = exception_bridge(&ex);
+ }
+ return hr;
+};
+
+STDMETHODIMP VLCVideo::deinterlaceEnable(BSTR mode)
+{
+ libvlc_media_player_t *p_md;
+ HRESULT hr = _p_instance->getMD(&p_md);
+ if( SUCCEEDED(hr) )
+ {
+ libvlc_exception_t ex;
+ libvlc_exception_init(&ex);
+ /* get deinterlace mode from the user */
+ char *psz_mode = CStrFromBSTR(CP_UTF8, mode);
+ /* enable deinterlace filter if possible */
+ libvlc_video_set_deinterlace(p_md, 1, psz_mode, &ex);
+ hr = exception_bridge(&ex);
+ CoTaskMemFree(psz_mode);
+ }
+ return hr;
+};
+
STDMETHODIMP VLCVideo::takeSnapshot(LPPICTUREDISP* picture)
{
if( NULL == picture )
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)) )
+ 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)
+ 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);
- if( ! libvlc_exception_raised(&ex) )
+ hr = exception_bridge(&ex);
+ if( SUCCEEDED(hr) )
{
- hr = E_FAIL;
/* open snapshot file */
- HANDLE snapPic = LoadImage(NULL, filepath, IMAGE_BITMAP,0, 0, LR_CREATEDIBSECTION|LR_LOADFROMFILE);
+ HANDLE snapPic = LoadImage(NULL, filepath, IMAGE_BITMAP, 0, 0,
+ LR_CREATEDIBSECTION|LR_LOADFROMFILE);
if( snapPic )
{
PICTDESC snapDesc;
snapDesc.bmp.hbitmap = (HBITMAP)snapPic;
snapDesc.bmp.hpal = NULL;
- hr = OleCreatePictureIndirect(&snapDesc, IID_IPictureDisp, TRUE, (LPVOID*)picture);
+ hr = OleCreatePictureIndirect(&snapDesc, IID_IPictureDisp,
+ TRUE, (LPVOID*)picture);
if( FAILED(hr) )
{
*picture = NULL;
}
}
DeleteFile(filepath);
- return hr;
}
- _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
- libvlc_exception_clear(&ex);
- return E_FAIL;
}
return hr;
};
return hr;
};
+STDMETHODIMP VLCVideo::get_marquee(IVLCMarquee** obj)
+{
+ if( NULL == obj )
+ return E_POINTER;
+
+ *obj = _p_vlcmarquee;
+ if( NULL != _p_vlcmarquee )
+ {
+ _p_vlcmarquee->AddRef();
+ return NOERROR;
+ }
+ return E_OUTOFMEMORY;
+};
+
/*******************************************************************************/
VLCControl2::VLCControl2(VLCPlugin *p_instance) :
return E_POINTER;
/*
- * Note to developpers
+ * Note to developers
*
* Returning the _b_toolbar is closer to the method specification.
* But returning True when toolbar is not implemented so not displayed
projects / vlc / blobdiff