author | wimpie <wimpie> | 2005-01-04 01:31:53 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-04 01:31:53 (UTC) |
commit | 42638ffd708a5236ad9a1f06a40b9d8b7919277c (patch) (unidiff) | |
tree | 687d61c6e2d5ddd20dff42cf6e1b18afbe81633f | |
parent | 0f3d74b472817e6b4f9d80adc122281b84629c1f (diff) | |
download | opie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.zip opie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.tar.gz opie-42638ffd708a5236ad9a1f06a40b9d8b7919277c.tar.bz2 |
CONTROL file :changed VERSION string
-rw-r--r-- | libopie2/opiemm/libopiemm2.control | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control index d0f34a8..0dd2df2 100644 --- a/libopie2/opiemm/libopiemm2.control +++ b/libopie2/opiemm/libopiemm2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiemm2 | 1 | Package: libopiemm2 |
2 | Files: lib/libopiemm2.so.* | 2 | Files: lib/libopiemm2.so.* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.8.2-$SUB_VERSION.2 | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 (1.8.2) | 8 | Depends: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiemm2 | 9 | Provides: libopiemm2 |
10 | Description: Opie library 2.0 MM | 10 | Description: Opie library 2.0 MM |
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 17e5cb0..13b26e6 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -305,18 +305,16 @@ void OMixerInterface::setVolume( const QString& channel, int left, int right ) | |||
305 | 305 | ||
306 | 306 | ||
307 | int OMixerInterface::volume( const QString& channel ) const | 307 | int OMixerInterface::volume( const QString& channel ) const |
308 | { | 308 | { |
309 | int volume; | 309 | int volume; |
310 | 310 | ||
311 | if ( _channels.contains( channel ) ) | 311 | if ( _channels.contains( channel ) ) |
312 | { | 312 | { |
313 | if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 ) | 313 | if ( ioctl( _fd, MIXER_READ( _channels[channel] ), &volume ) == -1 ) |
314 | { | 314 | { |
315 | owarn << "Can't get volume: " << strerror( errno ) << oendl; | 315 | owarn << "Can't get volume: " << strerror( errno ) << oendl; |
316 | } | 316 | } |
317 | else return volume; | 317 | else return volume; |
318 | } | 318 | } |
319 | return -1; | 319 | return -1; |
320 | } | 320 | } |
321 | |||
322 | |||
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h index 3c3b622..bd69114 100644 --- a/libopie2/opiemm/osoundsystem.h +++ b/libopie2/opiemm/osoundsystem.h | |||
@@ -217,17 +217,16 @@ class OMixerInterface : public QObject | |||
217 | 217 | ||
218 | protected: | 218 | protected: |
219 | int _fd; | 219 | int _fd; |
220 | QMap<QString, int> _channels; | 220 | QMap<QString, int> _channels; |
221 | 221 | ||
222 | private: | 222 | private: |
223 | void init(); | 223 | void init(); |
224 | private: | 224 | private: |
225 | class Private; | 225 | class Private; |
226 | Private *d; | 226 | Private *d; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | #endif // OSOUNDSYSTEM_H | 232 | #endif // OSOUNDSYSTEM_H |
233 | |||