/*****************************************************************************
* vlccontrol.cpp: ActiveX control for VLC
*****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2010 the VideoLAN team
*
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
* Jean-Paul Saman <jpsaman@videolan.org>
*isVisible = _p_instance->getVisible() ? VARIANT_TRUE : VARIANT_FALSE;
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::put_Visible(VARIANT_BOOL isVisible)
{
_p_instance->setVisible(isVisible != VARIANT_FALSE);
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::play(void)
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- _p_instance->playlist_play(&ex);
- HRESULT result = exception_bridge(&ex);
- if( SUCCEEDED(result) )
- _p_instance->fireOnPlayEvent();
- return result;
+ _p_instance->playlist_play();
+ _p_instance->fireOnPlayEvent();
+ return S_OK;
};
STDMETHODIMP VLCControl::pause(void)
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_media_player_pause(p_md, &ex);
- result = exception_bridge(&ex);
- if( SUCCEEDED(result) )
- _p_instance->fireOnPauseEvent();
+ libvlc_media_player_pause(p_md);
+ _p_instance->fireOnPauseEvent();
}
return result;
};
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
libvlc_media_player_stop(p_md);
- result = exception_bridge(&ex);
- if( SUCCEEDED(result) )
- _p_instance->fireOnStopEvent();
+ _p_instance->fireOnStopEvent();
}
return result;
};
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *position = libvlc_media_player_get_position(p_md, &ex);
- result = exception_bridge(&ex);
+ *position = libvlc_media_player_get_position(p_md);
}
return result;
};
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_media_player_set_position(p_md, position, &ex);
- result = exception_bridge(&ex);
+ libvlc_media_player_set_position(p_md, position);
}
return result;
};
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *seconds = libvlc_media_player_get_time(p_md, &ex);
- result = exception_bridge(&ex);
+ *seconds = libvlc_media_player_get_time(p_md);
}
return result;
};
{
/* setTime function of the plugin sets the time. */
_p_instance->setTime(seconds);
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::shuttle(int seconds)
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
if( seconds < 0 ) seconds = 0;
- libvlc_media_player_set_time(p_md, (int64_t)seconds, &ex);
- result = exception_bridge(&ex);
+ libvlc_media_player_set_time(p_md, (int64_t)seconds);
}
return result;
{
if( libvlc_media_player_is_playing(p_md) )
{
- libvlc_toggle_fullscreen(p_md, NULL);
+ libvlc_toggle_fullscreen(p_md);
}
}
return result;
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *seconds = (double)libvlc_media_player_get_length(p_md, &ex);
- result = exception_bridge(&ex);
+ *seconds = (double)libvlc_media_player_get_length(p_md);
}
return result;
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_media_player_set_rate(p_md, rate, &ex);
- result = exception_bridge(&ex);
+ libvlc_media_player_set_rate(p_md, rate);
}
return result;
};
HRESULT result = _p_instance->getMD(&p_md);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- libvlc_media_player_set_rate(p_md, rate, &ex);
- result = exception_bridge(&ex);
+ libvlc_media_player_set_rate(p_md, rate);
}
return result;
};
return E_POINTER;
*volume = _p_instance->getVolume();
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::put_Volume(int volume)
{
_p_instance->setVolume(volume);
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::toggleMute(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_audio_toggle_mute(p_libvlc);
+ libvlc_audio_toggle_mute(p_md);
return result;
};
if( FAILED(CreateTargetOptions(CP_UTF8, &options, &cOptions, &cOptionsCount)) )
return E_INVALIDARG;
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
position = _p_instance->playlist_add_extended_untrusted(cUri,
- cOptionsCount, const_cast<const char**>(cOptions), &ex);
+ cOptionsCount, const_cast<const char**>(cOptions));
FreeTargetOptions(cOptions, cOptionsCount);
CoTaskMemFree(cUri);
- hr = exception_bridge(&ex);
- if( SUCCEEDED(hr) )
+ if( position >= 0 )
{
if( mode & VLCPlayListAppendAndGo )
_p_instance->fireOnPlayEvent();
HRESULT result = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *index = _p_instance->playlist_get_current_index(&ex);
- result = exception_bridge(&ex);
+ *index = _p_instance->playlist_get_current_index();
}
return result;
};
if( NULL == count )
return E_POINTER;
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- *count = _p_instance->playlist_count(&ex);
- return exception_bridge(&ex);
+ *count = _p_instance->playlist_count();
+ return S_OK;
};
STDMETHODIMP VLCControl::playlistNext(void)
HRESULT result = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- _p_instance->playlist_next(&ex);
- result = exception_bridge(&ex);
+ _p_instance->playlist_next();
}
return result;
};
HRESULT result = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- _p_instance->playlist_prev(&ex);
- result = exception_bridge(&ex);
+ _p_instance->playlist_prev();
}
return result;
};
HRESULT result = _p_instance->getVLC(&p_libvlc);
if( SUCCEEDED(result) )
{
- libvlc_exception_t ex;
- libvlc_exception_init(&ex);
-
- _p_instance->playlist_clear(&ex);
- result = exception_bridge(&ex);
+ _p_instance->playlist_clear();
}
return result;
};
*mrl = SysAllocStringLen(_p_instance->getMRL(),
SysStringLen(_p_instance->getMRL()));
- return NOERROR;
+ return S_OK;
};
STDMETHODIMP VLCControl::put_MRL(BSTR mrl)