mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Internal refactoring of file functions and win32 com objects.

Browse source
This commit is contained in:
Julian Storer 2010-04-25 21:13:12 +01:00
parent 87175e988b
commit 21006fbd0a
27 changed files with 593 additions and 1285 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/native/windows/juce_win32_CameraDevice.cpp
View file

@ -624,7 +624,7 @@ private:
}
//==============================================================================
class GrabberCallback : public ISampleGrabberCB
class GrabberCallback : public ComBaseClassHelper <ISampleGrabberCB>
{
public:
GrabberCallback (DShowCameraDeviceInteral& owner_)
@ -632,25 +632,6 @@ private:
{
}
HRESULT __stdcall QueryInterface (REFIID id, void** result)
{
if (id == IID_IUnknown)
*result = dynamic_cast <IUnknown*> (this);
else if (id == IID_ISampleGrabberCB)
*result = dynamic_cast <ISampleGrabberCB*> (this);
else
{
*result = 0;
return E_NOINTERFACE;
}
AddRef();
return S_OK;
}
ULONG __stdcall AddRef() { return ++refCount; }
ULONG __stdcall Release() { const int r = --refCount; if (r == 0) delete this; return r; }
//==============================================================================
STDMETHODIMP SampleCB (double /*SampleTime*/, IMediaSample* /*pSample*/)
{
@ -664,7 +645,6 @@ private:
}
private:
int refCount;
DShowCameraDeviceInteral& owner;
GrabberCallback (const GrabberCallback&);
@ -691,13 +671,13 @@ CameraDevice::CameraDevice (const String& name_, int /*index*/)
CameraDevice::~CameraDevice()
{
stopRecording();
delete (DShowCameraDeviceInteral*) internal;
delete static_cast <DShowCameraDeviceInteral*> (internal);
internal = 0;
}
Component* CameraDevice::createViewerComponent()
{
return new DShowCameraDeviceInteral::DShowCaptureViewerComp ((DShowCameraDeviceInteral*) internal);
return new DShowCameraDeviceInteral::DShowCaptureViewerComp (static_cast <DShowCameraDeviceInteral*> (internal));
}
const String CameraDevice::getFileExtension()
@ -837,16 +817,15 @@ CameraDevice* CameraDevice::openDevice (int index,
if (filter != 0)
{
CameraDevice* const cam = new CameraDevice (name, index);
ScopedPointer <CameraDevice> cam (new CameraDevice (name, index));
DShowCameraDeviceInteral* const intern
= new DShowCameraDeviceInteral (cam, captureGraphBuilder, filter,
minWidth, minHeight, maxWidth, maxHeight);
cam->internal = intern;
if (intern->ok)
return cam;
else
delete cam;
return cam.release();
}
}