mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Windows: Tidied up the usage of the JUCE_COMCALL, JUCE_COMCLASS, and JUCE_IUNKNOWNCLASS macros

Browse source
This commit is contained in:
ed 2020-11-30 12:09:49 +00:00
parent dc242f76db
commit af69be5346
7 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/juce_audio_devices/native/juce_win32_Midi.cpp
View file

@ -782,9 +782,9 @@ private:
public:
virtual ~DeviceCallbackHandler() {};
virtual HRESULT addDevice (IDeviceInformation*) = 0;
virtual HRESULT removeDevice (IDeviceInformationUpdate*) = 0;
virtual HRESULT updateDevice (IDeviceInformationUpdate*) = 0;
JUCE_COMCALL addDevice (IDeviceInformation*) = 0;
JUCE_COMCALL removeDevice (IDeviceInformationUpdate*) = 0;
JUCE_COMCALL updateDevice (IDeviceInformationUpdate*) = 0;
bool attach (HSTRING deviceSelector, DeviceInformationKind infoKind)
{

17
modules/juce_audio_devices/native/juce_win32_WASAPI.cpp
View file

@ -116,9 +116,6 @@ bool check (HRESULT hr)
#define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT uuidFromString ("00000003-0000-0010-8000-00aa00389b71")
#endif
#define JUCE_IUNKNOWNCLASS(name, guid) JUCE_COMCLASS(name, guid) : public IUnknown
#define JUCE_COMCALL virtual HRESULT STDMETHODCALLTYPE
enum EDataFlow
{
eRender = 0,
@ -337,10 +334,6 @@ JUCE_IUNKNOWNCLASS (IAudioSessionControl, "F4B1A599-7266-4319-A8CA-E70ACB11E8CD"
JUCE_COMCALL UnregisterAudioSessionNotification (IAudioSessionEvents*) = 0;
};
#undef JUCE_COMCALL
#undef JUCE_COMCLASS
#undef JUCE_IUNKNOWNCLASS
//==============================================================================
namespace WasapiClasses
{
@ -1755,11 +1748,11 @@ private:
ChangeNotificationClient (WASAPIAudioIODeviceType* d)
: ComBaseClassHelper<IMMNotificationClient> (0), device (d) {}
HRESULT STDMETHODCALLTYPE OnDeviceAdded (LPCWSTR) { return notify(); }
HRESULT STDMETHODCALLTYPE OnDeviceRemoved (LPCWSTR) { return notify(); }
HRESULT STDMETHODCALLTYPE OnDeviceStateChanged(LPCWSTR, DWORD) { return notify(); }
HRESULT STDMETHODCALLTYPE OnDefaultDeviceChanged (EDataFlow, ERole, LPCWSTR) { return notify(); }
HRESULT STDMETHODCALLTYPE OnPropertyValueChanged (LPCWSTR, const PROPERTYKEY) { return notify(); }
JUCE_COMRESULT OnDeviceAdded (LPCWSTR) { return notify(); }
JUCE_COMRESULT OnDeviceRemoved (LPCWSTR) { return notify(); }
JUCE_COMRESULT OnDeviceStateChanged(LPCWSTR, DWORD) { return notify(); }
JUCE_COMRESULT OnDefaultDeviceChanged (EDataFlow, ERole, LPCWSTR) { return notify(); }
JUCE_COMRESULT OnPropertyValueChanged (LPCWSTR, const PROPERTYKEY) { return notify(); }
private:
WeakReference<WASAPIAudioIODeviceType> device;