summaryrefslogtreecommitdiffstats
path: root/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-01-19 11:01:18 +1000
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-01-19 11:01:18 +1000
commitd114cbc788cadef4dd0907d8f8a06541f72e77c9 (patch)
tree2656690917745796ab663f0326aa456148e3d3bc /plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
parentbd46676fc3d8331ac2cb45b97a250d56b8277219 (diff)
Merge DirectShowRenderThread into DirectShowPlayerService.
The two were only separate so DirectShowRenderThread could implement run, but it's better if that implementation just defers directly to a run function in DirectShowPlayerService.
Diffstat (limited to 'plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h')
-rw-r--r--plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
index 5e149bd709..c171125a3d 100644
--- a/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
+++ b/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
@@ -46,7 +46,7 @@
#include <dshow.h>
-class DirectShowRenderThread;
+class DirectShowPlayerService;
QTM_USE_NAMESPACE
@@ -54,7 +54,7 @@ class DirectShowAudioEndpointControl : public QAudioEndpointSelector
{
Q_OBJECT
public:
- DirectShowAudioEndpointControl(DirectShowRenderThread *renderThread, QObject *parent = 0);
+ DirectShowAudioEndpointControl(DirectShowPlayerService *service, QObject *parent = 0);
~DirectShowAudioEndpointControl();
QList<QString> availableEndpoints() const;
@@ -69,7 +69,7 @@ public:
private:
void updateEndpoints();
- DirectShowRenderThread *m_renderThread;
+ DirectShowPlayerService *m_service;
IBindCtx *m_bindContext;
ICreateDevEnum *m_deviceEnumerator;