-rw-r--r-- | libopie2/opiemm/opiemm.pro | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 17 |
3 files changed, 20 insertions, 1 deletions
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index d6f54ee..ce30dfb 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro | |||
@@ -2,13 +2,13 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = osoundsystem.h | 4 | HEADERS = osoundsystem.h |
5 | SOURCES = osoundsystem.cpp | 5 | SOURCES = osoundsystem.cpp |
6 | INTERFACES = | 6 | INTERFACES = |
7 | TARGET = opiemm2 | 7 | TARGET = opiemm2 |
8 | VERSION = 1.8.2 | 8 | VERSION = 1.9.0 |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | 11 | ||
12 | !contains( platform, x11 ) { | 12 | !contains( platform, x11 ) { |
13 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
14 | } | 14 | } |
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 51e088c..07f26c0 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -38,12 +38,14 @@ | |||
38 | #include <sys/ioctl.h> | 38 | #include <sys/ioctl.h> |
39 | #include <sys/types.h> | 39 | #include <sys/types.h> |
40 | #include <sys/soundcard.h> | 40 | #include <sys/soundcard.h> |
41 | #include <sys/stat.h> | 41 | #include <sys/stat.h> |
42 | 42 | ||
43 | 43 | ||
44 | using namespace Opie::Core; | ||
45 | using namespace Opie::MM; | ||
44 | /*====================================================================================== | 46 | /*====================================================================================== |
45 | * OSoundSystem | 47 | * OSoundSystem |
46 | *======================================================================================*/ | 48 | *======================================================================================*/ |
47 | 49 | ||
48 | OSoundSystem* OSoundSystem::_instance = 0; | 50 | OSoundSystem* OSoundSystem::_instance = 0; |
49 | 51 | ||
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h index 096d397..3c3b622 100644 --- a/libopie2/opiemm/osoundsystem.h +++ b/libopie2/opiemm/osoundsystem.h | |||
@@ -33,12 +33,15 @@ | |||
33 | #define OSOUNDSYSTEM_H | 33 | #define OSOUNDSYSTEM_H |
34 | 34 | ||
35 | #include <qobject.h> | 35 | #include <qobject.h> |
36 | #include <qdict.h> | 36 | #include <qdict.h> |
37 | #include <qmap.h> | 37 | #include <qmap.h> |
38 | 38 | ||
39 | namespace Opie { | ||
40 | namespace MM { | ||
41 | |||
39 | class OAudioInterface; | 42 | class OAudioInterface; |
40 | class OMixerInterface; | 43 | class OMixerInterface; |
41 | class OSoundCard; | 44 | class OSoundCard; |
42 | 45 | ||
43 | /*====================================================================================== | 46 | /*====================================================================================== |
44 | * OSoundSystem | 47 | * OSoundSystem |
@@ -87,12 +90,14 @@ class OSoundSystem : public QObject | |||
87 | protected: | 90 | protected: |
88 | OSoundSystem(); | 91 | OSoundSystem(); |
89 | 92 | ||
90 | private: | 93 | private: |
91 | static OSoundSystem* _instance; | 94 | static OSoundSystem* _instance; |
92 | CardMap _interfaces; | 95 | CardMap _interfaces; |
96 | class Private; | ||
97 | Private *d; | ||
93 | }; | 98 | }; |
94 | 99 | ||
95 | 100 | ||
96 | /*====================================================================================== | 101 | /*====================================================================================== |
97 | * OSoundCard | 102 | * OSoundCard |
98 | *======================================================================================*/ | 103 | *======================================================================================*/ |
@@ -121,12 +126,15 @@ class OSoundCard : public QObject | |||
121 | protected: | 126 | protected: |
122 | OAudioInterface* _audio; | 127 | OAudioInterface* _audio; |
123 | OMixerInterface* _mixer; | 128 | OMixerInterface* _mixer; |
124 | 129 | ||
125 | private: | 130 | private: |
126 | void init(); | 131 | void init(); |
132 | private: | ||
133 | class Private; | ||
134 | Private *d; | ||
127 | }; | 135 | }; |
128 | 136 | ||
129 | /*====================================================================================== | 137 | /*====================================================================================== |
130 | * OAudioInterface | 138 | * OAudioInterface |
131 | *======================================================================================*/ | 139 | *======================================================================================*/ |
132 | 140 | ||
@@ -147,12 +155,15 @@ class OAudioInterface : public QObject | |||
147 | 155 | ||
148 | protected: | 156 | protected: |
149 | const int _sfd; | 157 | const int _sfd; |
150 | 158 | ||
151 | private: | 159 | private: |
152 | void init(); | 160 | void init(); |
161 | private: | ||
162 | class Private; | ||
163 | Private *d; | ||
153 | }; | 164 | }; |
154 | 165 | ||
155 | 166 | ||
156 | /*====================================================================================== | 167 | /*====================================================================================== |
157 | * OMixerInterface | 168 | * OMixerInterface |
158 | *======================================================================================*/ | 169 | *======================================================================================*/ |
@@ -207,10 +218,16 @@ class OMixerInterface : public QObject | |||
207 | protected: | 218 | protected: |
208 | int _fd; | 219 | int _fd; |
209 | QMap<QString, int> _channels; | 220 | QMap<QString, int> _channels; |
210 | 221 | ||
211 | private: | 222 | private: |
212 | void init(); | 223 | void init(); |
224 | private: | ||
225 | class Private; | ||
226 | Private *d; | ||
213 | }; | 227 | }; |
214 | 228 | ||
229 | } | ||
230 | } | ||
231 | |||
215 | #endif // OSOUNDSYSTEM_H | 232 | #endif // OSOUNDSYSTEM_H |
216 | 233 | ||