Skip to content

Commit b6c5f47

Browse files
sgretschersgretscher
committed
Drop ARAIPC prefix from C++ class and type names that are defined inside ARA::IPC namespace
1 parent 520a50c commit b6c5f47

12 files changed

Lines changed: 293 additions & 293 deletions

‎IPC/ARAIPC.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extern "C" {
6565
#define ARA_IPC_REF(IPCRefType) struct IPCRefType##MarkupType * IPCRefType
6666

6767

68-
//! C-compatible wrapper of ARAIPCMessageChannel
68+
//! C-compatible wrapper of MessageChannel
6969
typedef ARA_IPC_REF(ARAIPCMessageChannelRef);
7070

7171

‎IPC/ARAIPCAudioUnit_v3.mm‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@
5151

5252

5353
// message channel base class for both proxy implementations
54-
class ARAIPCAUMessageChannel : public ARAIPCMessageChannel
54+
class AudioUnitMessageChannel : public MessageChannel
5555
{
5656
protected:
57-
ARAIPCAUMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel, ARAIPCMessageHandler * messageHandler)
58-
: ARAIPCMessageChannel { messageHandler },
57+
AudioUnitMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel, MessageHandler * messageHandler)
58+
: MessageChannel { messageHandler },
5959
_audioUnitChannel { audioUnitChannel }
6060
{}
6161

6262
public:
63-
ARAIPCMessageEncoder * createEncoder () override
63+
MessageEncoder * createEncoder () override
6464
{
65-
return new ARAIPCCFMessageEncoder {};
65+
return new CFMessageEncoder {};
6666
}
6767

6868
bool receiverEndianessMatches () override
@@ -73,14 +73,14 @@ bool receiverEndianessMatches () override
7373

7474
void routeReceivedMessage (NSDictionary * _Nonnull message)
7575
{
76-
const ARAIPCMessageID messageID { [(NSNumber *) [message objectForKey:_messageIDKey] intValue] };
77-
const auto decoder { new ARAIPCCFMessageDecoder { (__bridge CFDictionaryRef) message } };
78-
ARAIPCMessageChannel::routeReceivedMessage (messageID, decoder);
76+
const MessageID messageID { [(NSNumber *) [message objectForKey:_messageIDKey] intValue] };
77+
const auto decoder { new CFMessageDecoder { (__bridge CFDictionaryRef) message } };
78+
MessageChannel::routeReceivedMessage (messageID, decoder);
7979
}
8080

81-
void _sendMessage (ARAIPCMessageID messageID, ARAIPCMessageEncoder * encoder) override
81+
void _sendMessage (MessageID messageID, MessageEncoder * encoder) override
8282
{
83-
const auto dictionary { static_cast<ARAIPCCFMessageEncoder *> (encoder)->copyDictionary () };
83+
const auto dictionary { static_cast<CFMessageEncoder *> (encoder)->copyDictionary () };
8484
#if !__has_feature(objc_arc)
8585
auto message { (__bridge NSMutableDictionary *) dictionary };
8686
#else
@@ -112,26 +112,26 @@ void _sendMessage (ARAIPCMessageID messageID, ARAIPCMessageEncoder * encoder) ov
112112
_Pragma ("GCC diagnostic ignored \"-Wunguarded-availability\"")
113113
#endif
114114

115-
ARA_MAP_IPC_REF (ARAIPCAUMessageChannel, ARA::IPC::ARAIPCMessageChannelRef)
115+
ARA_MAP_IPC_REF (AudioUnitMessageChannel, ARA::IPC::ARAIPCMessageChannelRef)
116116

117117
#if defined (__GNUC__)
118118
_Pragma ("GCC diagnostic pop")
119119
#endif
120120

121121

122122
// plug-in side: proxy host message channel specialization
123-
class ARAIPCAUHostMessageChannel : public ARAIPCAUMessageChannel, public ARAIPCProxyHostMessageHandler
123+
class ProxyHostMessageChannel : public AudioUnitMessageChannel, public ProxyHostMessageHandler
124124
{
125125
public:
126-
ARAIPCAUHostMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel,
127-
AUAudioUnit * _Nullable audioUnit)
128-
: ARAIPCAUMessageChannel { audioUnitChannel, this },
126+
ProxyHostMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel,
127+
AUAudioUnit * _Nullable audioUnit)
128+
: AudioUnitMessageChannel { audioUnitChannel, this },
129129
_audioUnit { audioUnit },
130130
_sendLock { dispatch_semaphore_create (1) }
131131
{}
132132

133133
#if !__has_feature(objc_arc)
134-
~ARAIPCAUHostMessageChannel () override
134+
~ProxyHostMessageChannel () override
135135
{
136136
dispatch_release (_sendLock);
137137
}
@@ -166,11 +166,11 @@ void _sendMessage (ARAIPCMessageID messageID, ARAIPCMessageEncoder * encoder) ov
166166

167167

168168
// host side: proxy plug-in message channel specialization
169-
class ARAIPCAUPlugInMessageChannel : public ARAIPCAUMessageChannel, public ARAIPCProxyPlugInMessageHandler
169+
class ProxyPlugInMessageChannel : public AudioUnitMessageChannel, public ProxyPlugInMessageHandler
170170
{
171171
public:
172-
ARAIPCAUPlugInMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel)
173-
: ARAIPCAUMessageChannel { audioUnitChannel, this }
172+
ProxyPlugInMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel)
173+
: AudioUnitMessageChannel { audioUnitChannel, this }
174174
{
175175
getAudioUnitChannel ().callHostBlock =
176176
^NSDictionary * _Nullable (NSDictionary * _Nonnull message)
@@ -180,7 +180,7 @@ void _sendMessage (ARAIPCMessageID messageID, ARAIPCMessageEncoder * encoder) ov
180180
};
181181
}
182182

183-
~ARAIPCAUPlugInMessageChannel () override
183+
~ProxyPlugInMessageChannel () override
184184
{
185185
getAudioUnitChannel ().callHostBlock = nil;
186186
}
@@ -195,22 +195,22 @@ void _sendMessage (ARAIPCMessageID messageID, ARAIPCMessageEncoder * encoder) ov
195195

196196

197197
// host side: proxy plug-in message channel further specialization for plug-in extension messages
198-
class ARAIPCAUPlugInExtensionMessageChannel : public ARAIPCAUPlugInMessageChannel
198+
class ProxyPlugInExtensionMessageChannel : public ProxyPlugInMessageChannel
199199
{
200200
private:
201-
using ARAIPCAUPlugInMessageChannel::ARAIPCAUPlugInMessageChannel;
201+
using ProxyPlugInMessageChannel::ProxyPlugInMessageChannel;
202202

203203
public:
204-
static ARAIPCAUPlugInExtensionMessageChannel * bindAndCreateMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel,
205-
ARADocumentControllerRef _Nonnull documentControllerRef,
206-
ARAPlugInInstanceRoleFlags knownRoles, ARAPlugInInstanceRoleFlags assignedRoles)
204+
static ProxyPlugInExtensionMessageChannel * bindAndCreateMessageChannel (NSObject<AUMessageChannel> * _Nonnull audioUnitChannel,
205+
ARADocumentControllerRef _Nonnull documentControllerRef,
206+
ARAPlugInInstanceRoleFlags knownRoles, ARAPlugInInstanceRoleFlags assignedRoles)
207207
{
208-
auto messageChannel { new ARAIPCAUPlugInExtensionMessageChannel { audioUnitChannel } };
208+
auto messageChannel { new ProxyPlugInExtensionMessageChannel { audioUnitChannel } };
209209
messageChannel->_plugInExtensionInstance = ARAIPCProxyPlugInBindToDocumentController (nullptr, toIPCRef (messageChannel), documentControllerRef, knownRoles, assignedRoles);
210210
return messageChannel;
211211
}
212212

213-
~ARAIPCAUPlugInExtensionMessageChannel () override
213+
~ProxyPlugInExtensionMessageChannel () override
214214
{
215215
if (_plugInExtensionInstance)
216216
ARAIPCProxyPlugInCleanupBinding (_plugInExtensionInstance);
@@ -246,7 +246,7 @@ ARAIPCMessageChannelRef _Nullable ARA_CALL ARAIPCAUProxyPlugInInitializeFactoryM
246246
if (!factoryChannel)
247247
return nullptr;
248248

249-
return toIPCRef (new ARAIPCAUPlugInMessageChannel { (NSObject<AUMessageChannel> * _Nonnull) factoryChannel });
249+
return toIPCRef (new ProxyPlugInMessageChannel { (NSObject<AUMessageChannel> * _Nonnull) factoryChannel });
250250
}
251251

252252
const ARAFactory * _Nonnull ARA_CALL ARAIPCAUProxyPlugInGetFactory (ARAIPCMessageChannelRef _Nonnull messageChannelRef)
@@ -270,8 +270,8 @@ ARAIPCMessageChannelRef _Nullable ARA_CALL ARAIPCAUProxyPlugInInitializeFactoryM
270270
return nullptr;
271271
}
272272

273-
const auto messageChannel { ARAIPCAUPlugInExtensionMessageChannel::bindAndCreateMessageChannel ((NSObject<AUMessageChannel> * _Nonnull) audioUnitChannel,
274-
documentControllerRef, knownRoles, assignedRoles) };
273+
const auto messageChannel { ProxyPlugInExtensionMessageChannel::bindAndCreateMessageChannel ((NSObject<AUMessageChannel> * _Nonnull) audioUnitChannel,
274+
documentControllerRef, knownRoles, assignedRoles) };
275275
*messageChannelRef = toIPCRef (messageChannel);
276276
return messageChannel->getPlugInExtensionInstance ();
277277
}
@@ -289,7 +289,7 @@ void ARA_CALL ARAIPCAUProxyPlugInUninitializeFactoryMessageChannel (ARAIPCMessag
289289

290290

291291
// plug-in side: proxy host C adapter
292-
ARAIPCAUHostMessageChannel * _factoryMessageChannel {};
292+
ProxyHostMessageChannel * _factoryMessageChannel {};
293293

294294
void ARA_CALL ARAIPCAUProxyHostAddFactory (const ARAFactory * _Nonnull factory)
295295
{
@@ -300,26 +300,26 @@ void ARA_CALL ARAIPCAUProxyHostAddFactory (const ARAFactory * _Nonnull factory)
300300
ARADocumentControllerRef controllerRef,
301301
ARAPlugInInstanceRoleFlags knownRoles, ARAPlugInInstanceRoleFlags assignedRoles)
302302
{
303-
auto audioUnit { static_cast<ARAIPCAUHostMessageChannel *> (fromIPCRef (messageChannelRef))->getAudioUnit () };
303+
auto audioUnit { static_cast<ProxyHostMessageChannel *> (fromIPCRef (messageChannelRef))->getAudioUnit () };
304304
return [(AUAudioUnit<ARAAudioUnit> *) audioUnit bindToDocumentController:controllerRef withRoles:assignedRoles knownRoles:knownRoles];
305305
}
306306

307307
void ARA_CALL ARAIPCAUProxyHostInitialize (NSObject<AUMessageChannel> * _Nonnull factoryMessageChannel)
308308
{
309-
_factoryMessageChannel = new ARAIPCAUHostMessageChannel { factoryMessageChannel, nil };
309+
_factoryMessageChannel = new ProxyHostMessageChannel { factoryMessageChannel, nil };
310310

311311
ARAIPCProxyHostSetBindingHandler (ARAIPCAUBindingHandler);
312312
}
313313

314314
ARAIPCMessageChannelRef _Nullable ARA_CALL ARAIPCAUProxyHostInitializeMessageChannel (AUAudioUnit * _Nonnull audioUnit,
315315
NSObject<AUMessageChannel> * _Nonnull audioUnitChannel)
316316
{
317-
return toIPCRef (new ARAIPCAUHostMessageChannel { audioUnitChannel, audioUnit });
317+
return toIPCRef (new ProxyHostMessageChannel { audioUnitChannel, audioUnit });
318318
}
319319

320320
NSDictionary * _Nonnull ARA_CALL ARAIPCAUProxyHostCommandHandler (ARAIPCMessageChannelRef _Nonnull messageChannelRef, NSDictionary * _Nonnull message)
321321
{
322-
static_cast<ARAIPCAUHostMessageChannel *> (fromIPCRef (messageChannelRef))->routeReceivedMessage (message);
322+
static_cast<ProxyHostMessageChannel *> (fromIPCRef (messageChannelRef))->routeReceivedMessage (message);
323323
return [NSDictionary dictionary]; // \todo it would yield better performance if -callAudioUnit: would allow nil as return value
324324
}
325325

0 commit comments

Comments
 (0)