*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "plugin.h"
{
ITypeLib *p_typelib;
- HRESULT hr = _p_instance->getTypeLib(LOCALE_USER_DEFAULT, &p_typelib);
+ hr = _p_instance->getTypeLib(LOCALE_USER_DEFAULT, &p_typelib);
if( SUCCEEDED(hr) )
{
hr = p_typelib->GetTypeInfoOfGuid(IID_IVLCControl, &_p_typeinfo);
{
_p_typeinfo->AddRef();
*ppTInfo = _p_typeinfo;
- return NO_ERROR;
+ return NOERROR;
}
*ppTInfo = NULL;
return E_NOTIMPL;
return NOERROR;
};
-
+
STDMETHODIMP VLCControl::put_Visible(VARIANT_BOOL isVisible)
{
_p_instance->setVisible(isVisible != VARIANT_FALSE);
STDMETHODIMP VLCControl::play(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_Play(i_vlc);
_p_instance->fireOnPlayEvent();
- return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::pause(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_Pause(i_vlc);
_p_instance->fireOnPauseEvent();
- return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::stop(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_Stop(i_vlc);
_p_instance->fireOnStopEvent();
- return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_Playing(VARIANT_BOOL *isPlaying)
{
if( NULL == isPlaying )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = NOERROR;
+ if( _p_instance->isRunning() )
{
- *isPlaying = VLC_IsPlaying(i_vlc) ? VARIANT_TRUE : VARIANT_FALSE;
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ *isPlaying = VLC_IsPlaying(i_vlc) ? VARIANT_TRUE : VARIANT_FALSE;
+ return NOERROR;
+ }
}
*isPlaying = VARIANT_FALSE;
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_Position(float *position)
{
if( NULL == position )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- *position = VLC_PositionGet(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ *position = VLC_PositionGet(i_vlc);
+ return NOERROR;
+ }
}
*position = 0.0f;
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::put_Position(float position)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- VLC_PositionSet(i_vlc, position);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ VLC_PositionSet(i_vlc, position);
+ }
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_Time(int *seconds)
{
if( NULL == seconds )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = NOERROR;
+ if( _p_instance->isRunning() )
{
- *seconds = VLC_TimeGet(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ *seconds = VLC_TimeGet(i_vlc);
+ }
}
- *seconds = 0;
- return E_UNEXPECTED;
+ else
+ *seconds = _p_instance->getTime();
+
+ return result;
};
-
+
STDMETHODIMP VLCControl::put_Time(int seconds)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
- {
- VLC_TimeSet(i_vlc, seconds, VLC_FALSE);
- return NOERROR;
- }
- return E_UNEXPECTED;
+ _p_instance->setTime(seconds);
+
+ return NOERROR;
};
-
+
STDMETHODIMP VLCControl::shuttle(int seconds)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- VLC_TimeSet(i_vlc, seconds, VLC_TRUE);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ VLC_TimeSet(i_vlc, seconds, VLC_TRUE);
+ }
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::fullscreen(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- VLC_FullScreen(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ VLC_FullScreen(i_vlc);
+ }
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_Length(int *seconds)
{
if( NULL == seconds )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = NOERROR;
+ if( _p_instance->isRunning() )
{
- *seconds = VLC_LengthGet(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ *seconds = VLC_LengthGet(i_vlc);
+ return NOERROR;
+ }
}
*seconds = 0;
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::playFaster(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- VLC_SpeedFaster(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ VLC_SpeedFaster(i_vlc);
+ }
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::playSlower(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ HRESULT result = E_UNEXPECTED;
+ if( _p_instance->isRunning() )
{
- VLC_SpeedSlower(i_vlc);
- return NOERROR;
+ int i_vlc;
+ result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
+ {
+ VLC_SpeedSlower(i_vlc);
+ }
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_Volume(int *volume)
{
if( NULL == volume )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
- {
- *volume = VLC_VolumeGet(i_vlc);
- return NOERROR;
- }
- *volume = 0;
- return E_UNEXPECTED;
+ *volume = _p_instance->getVolume();
+ return NOERROR;
};
-
+
STDMETHODIMP VLCControl::put_Volume(int volume)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
- {
- VLC_VolumeSet(i_vlc, volume);
- return NOERROR;
- }
- return E_UNEXPECTED;
+ _p_instance->setVolume(volume);
+ return NOERROR;
};
-
+
STDMETHODIMP VLCControl::toggleMute(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_VolumeMute(i_vlc);
- return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
STDMETHODIMP VLCControl::setVariable(BSTR name, VARIANT value)
if( 0 == SysStringLen(name) )
return E_INVALIDARG;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT hr = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(hr) )
{
int codePage = _p_instance->getCodePage();
char *psz_varname = CStrFromBSTR(codePage, name);
if( NULL == psz_varname )
return E_OUTOFMEMORY;
- HRESULT hr = E_INVALIDARG;
int i_type;
vlc_value_t val;
-
+
if( VLC_SUCCESS == VLC_VariableType(i_vlc, psz_varname, &i_type) )
{
VARIANT arg;
hr = VariantChangeType(&arg, &value, 0, VT_BSTR);
if( SUCCEEDED(hr) )
{
+ i_type = VLC_VAR_STRING;
val.psz_string = CStrFromBSTR(codePage, V_BSTR(&arg));
VariantClear(&arg);
}
}
}
else {
- // no defined type, defaults to VARIANT type
+ // no defined type, use type in VARIANT
hr = NO_ERROR;
switch( V_VT(&value) )
{
CoTaskMemFree(val.psz_string);
}
CoTaskMemFree(psz_varname);
-
- return hr;
}
- return E_UNEXPECTED;
+ return hr;
};
STDMETHODIMP VLCControl::getVariable( BSTR name, VARIANT *value)
if( 0 == SysStringLen(name) )
return E_INVALIDARG;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT hr = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(hr) )
{
UINT codePage = _p_instance->getCodePage();
char *psz_varname = CStrFromBSTR(codePage, name);
if( NULL == psz_varname )
return E_OUTOFMEMORY;
- HRESULT hr = E_INVALIDARG;
+ hr = E_INVALIDARG;
vlc_value_t val;
int i_type;
CoTaskMemFree(psz_varname);
return hr;
}
- return E_UNEXPECTED;
+ return hr;
};
-static void freeTargetOptions(char **cOptions, int cOptionCount)
+void VLCControl::FreeTargetOptions(char **cOptions, int cOptionCount)
{
// clean up
if( NULL != cOptions )
}
};
-static HRESULT createTargetOptions(int codePage, VARIANT *options, char ***cOptions, int *cOptionCount)
+HRESULT VLCControl::CreateTargetOptions(int codePage, VARIANT *options, char ***cOptions, int *cOptionCount)
{
HRESULT hr = E_INVALIDARG;
if( VT_ERROR == V_VT(options) )
if( FAILED(hr) )
{
// free already processed elements
- freeTargetOptions(*cOptions, *cOptionCount);
+ FreeTargetOptions(*cOptions, *cOptionCount);
}
}
else
SafeArrayGetUBound(array, 1, &uBound);
// have we got any options
- if( uBound > lBound )
+ if( uBound >= lBound )
{
VARTYPE vType;
hr = SafeArrayGetVartype(array, &vType);
// marshall options into an array of C strings
if( VT_VARIANT == vType )
{
- *cOptions = (char **)CoTaskMemAlloc(sizeof(char *)*(uBound-lBound));
+ *cOptions = (char **)CoTaskMemAlloc(sizeof(char *)*(uBound-lBound+1));
if( NULL == *cOptions )
return E_OUTOFMEMORY;
- ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound));
- for(pos=lBound; SUCCEEDED(hr) && (pos<uBound); ++pos )
+ ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound+1));
+ for(pos=lBound; (pos<=uBound) && SUCCEEDED(hr); ++pos )
{
VARIANT option;
hr = SafeArrayGetElement(array, &pos, &option);
}
else if( VT_BSTR == vType )
{
- *cOptions = (char **)CoTaskMemAlloc(sizeof(char *)*(uBound-lBound));
+ *cOptions = (char **)CoTaskMemAlloc(sizeof(char *)*(uBound-lBound+1));
if( NULL == *cOptions )
return E_OUTOFMEMORY;
- ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound));
- for(pos=lBound; (pos<uBound) && SUCCEEDED(hr); ++pos )
+ ZeroMemory(*cOptions, sizeof(char *)*(uBound-lBound+1));
+ for(pos=lBound; (pos<=uBound) && SUCCEEDED(hr); ++pos )
{
BSTR option;
hr = SafeArrayGetElement(array, &pos, &option);
if( FAILED(hr) )
{
// free already processed elements
- freeTargetOptions(*cOptions, *cOptionCount);
+ FreeTargetOptions(*cOptions, *cOptionCount);
}
}
else
if( 0 == SysStringLen(uri) )
return E_INVALIDARG;
- HRESULT hr = E_UNEXPECTED;
-
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT hr = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(hr) )
{
char *cUri = CStrFromBSTR(CP_UTF8, uri);
if( NULL == cUri )
int cOptionsCount;
char **cOptions;
- if( FAILED(createTargetOptions(CP_UTF8, &options, &cOptions, &cOptionsCount)) )
+ if( FAILED(CreateTargetOptions(CP_UTF8, &options, &cOptions, &cOptionsCount)) )
return E_INVALIDARG;
if( VLC_SUCCESS <= VLC_AddTarget(i_vlc, cUri, (const char **)cOptions, cOptionsCount, mode, position) )
_p_instance->fireOnStopEvent();
}
- freeTargetOptions(cOptions, cOptionsCount);
+ FreeTargetOptions(cOptions, cOptionsCount);
CoTaskMemFree(cUri);
}
return hr;
};
-
+
STDMETHODIMP VLCControl::get_PlaylistIndex(int *index)
{
if( NULL == index )
return E_POINTER;
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
*index = VLC_PlaylistIndex(i_vlc);
return NOERROR;
}
*index = 0;
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_PlaylistCount(int *count)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
*count = VLC_PlaylistNumberOfItems(i_vlc);
return NOERROR;
}
*count = 0;
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::playlistNext(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_PlaylistNext(i_vlc);
return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::playlistPrev(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_PlaylistPrev(i_vlc);
return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::playlistClear(void)
{
- int i_vlc = _p_instance->getVLCObject();
- if( i_vlc )
+ int i_vlc;
+ HRESULT result = _p_instance->getVLCObject(&i_vlc);
+ if( SUCCEEDED(result) )
{
VLC_PlaylistClear(i_vlc);
return NOERROR;
}
- return E_UNEXPECTED;
+ return result;
};
-
+
STDMETHODIMP VLCControl::get_VersionInfo(BSTR *version)
{
if( NULL == version )
const char *versionStr = VLC_Version();
if( NULL != versionStr )
{
- *version = BSTRFromCStr(_p_instance->getCodePage(), versionStr);
+ *version = BSTRFromCStr(CP_UTF8, versionStr);
return NULL == *version ? E_OUTOFMEMORY : NOERROR;
}
*version = NULL;
return E_FAIL;
};
-
+
STDMETHODIMP VLCControl::get_MRL(BSTR *mrl)
{
if( NULL == mrl )
_p_instance->setAutoLoop((VARIANT_FALSE != autoloop) ? TRUE: FALSE);
return S_OK;
};
-
projects / vlc / blobdiff