From 6d7c17a9ab1bccbf0bc656c87818338de28f408d Mon Sep 17 00:00:00 2001 From: blacky Date: Fri, 15 Jul 2011 20:25:22 +0200 Subject: - first attempt to remove QT - this compiles but does not provide the same functionality - hookplugin compiles - other plugins do not --- AudioManagerDaemon/HookEngine.h | 64 ++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) (limited to 'AudioManagerDaemon/HookEngine.h') diff --git a/AudioManagerDaemon/HookEngine.h b/AudioManagerDaemon/HookEngine.h index 6a43d26..33cd667 100644 --- a/AudioManagerDaemon/HookEngine.h +++ b/AudioManagerDaemon/HookEngine.h @@ -183,7 +183,7 @@ public: } ; virtual genHookResult_t hookRoutingRequest(bool onlyfree, source_t source, - sink_t sink, QList* ReturnList) { + sink_t sink, std::list* ReturnList) { (void) onlyfree; (void) source; (void) sink; @@ -282,8 +282,7 @@ public: sink_t SinkID); genError_t fireHookUserDisconnectionRequest(Queue* queue, connection_t connID); - genError_t fireHookRoutingRequest(bool onlyfree, source_t SourceID, - sink_t SinkID, QList* ReturnList); + genError_t fireHookRoutingRequest(bool onlyfree, source_t SourceID, sink_t SinkID, std::list* ReturnList); genError_t fireHookRoutingComplete(genRoute_t route); genError_t fireHookVolumeChange(volume_t newVolume, sink_t SinkID); genError_t fireHookMuteSource(source_t ID); @@ -303,44 +302,31 @@ private: hookprio_t prio; }; - QList m_domainRegisterList; - QList m_domainDeregisterList; - QList m_sinkRegisterList; - QList m_sinkDeregisterList; - QList m_sourceRegisterList; - QList m_sourceDeregisterList; - QList m_gatewayRegisterList; - QList m_gatewayDeregisterList; - QList m_systemReadyList; - QList m_systemDownList; - QList m_connectionRequestList; - QList m_disconnectionReuestList; - QList m_userConnectionRequestList; - QList m_userDisconnectionReuestList; - QList m_routingRequestList; - QList m_routingCompleteList; - QList m_volumeChangeList; - QList m_muteSourceList; - QList m_unmuteSourceList; - QList m_muteSinkList; - QList m_unmuteSinkList; - QList m_interruptRequestList; + std::list m_domainRegisterList; + std::list m_domainDeregisterList; + std::list m_sinkRegisterList; + std::list m_sinkDeregisterList; + std::list m_sourceRegisterList; + std::list m_sourceDeregisterList; + std::list m_gatewayRegisterList; + std::list m_gatewayDeregisterList; + std::list m_systemReadyList; + std::list m_systemDownList; + std::list m_connectionRequestList; + std::list m_disconnectionReuestList; + std::list m_userConnectionRequestList; + std::list m_userDisconnectionReuestList; + std::list m_routingRequestList; + std::list m_routingCompleteList; + std::list m_volumeChangeList; + std::list m_muteSourceList; + std::list m_unmuteSourceList; + std::list m_muteSinkList; + std::list m_unmuteSinkList; + std::list m_interruptRequestList; AudioManagerCore* m_core; - QList m_listofPlugins; + std::list m_listofPlugins; }; -/**Factory class for plugin. Needs just to return an instance of the class that the plugin implements. - * - */ -class HookPluginFactory { -public: - virtual ~HookPluginFactory() { - } - virtual BaseHook* returnInstance()=0; -}; - -Q_DECLARE_INTERFACE(HookPluginFactory,"HookPluginFactory/1.0") -; - #endif /* HOOKENGINE_H_ */ -- cgit v1.2.1