author | zecke <zecke> | 2004-08-25 21:51:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-25 21:51:13 (UTC) |
commit | df3e4c8b13c16aeb96e70dbaa2d409f83eed988e (patch) (unidiff) | |
tree | 59b12028c6e8a53b99f1686278b6e9fdc57ab18e /libopie2/opiecore/device/odevice.h | |
parent | e4811064703ad34f42f15c3044cd8f63c0e7583c (diff) | |
download | opie-df3e4c8b13c16aeb96e70dbaa2d409f83eed988e.zip opie-df3e4c8b13c16aeb96e70dbaa2d409f83eed988e.tar.gz opie-df3e4c8b13c16aeb96e70dbaa2d409f83eed988e.tar.bz2 |
-Have a common implementation for reading the config value
and setting the Mixer. The mixer, sound and path
is configurable
-Restore the Opie HEADER (who is guilty? probably me)
-Fix warnings
-Port Zaurus,Simpad,Ipaq to configure the mixer
Diffstat (limited to 'libopie2/opiecore/device/odevice.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index cb7a83f..f4b3e0e 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -1,27 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) The Opie Team <opie-devel@handhelds.org> | 3 | Copyright (C) The Opie Team <opie-devel@handhelds.org> |
4 | =. | 4 | =. |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
@@ -38,13 +38,18 @@ _;:, .> :=|. This program is free software; you can | |||
38 | #include <qnamespace.h> | 38 | #include <qnamespace.h> |
39 | #include <qobject.h> | 39 | #include <qobject.h> |
40 | #include <qstring.h> | 40 | #include <qstring.h> |
41 | |||
42 | |||
41 | #include <qstrlist.h> | 43 | #include <qstrlist.h> |
42 | #include <qwindowsystem_qws.h> | 44 | #include <qwindowsystem_qws.h> |
43 | 45 | ||
46 | |||
47 | class Sound; | ||
48 | |||
44 | namespace Opie{ | 49 | namespace Opie{ |
45 | namespace Core{ | 50 | namespace Core{ |
46 | 51 | ||
47 | class ODeviceData; | 52 | class ODeviceData; |
48 | /** | 53 | /** |
49 | * The available devices | 54 | * The available devices |
50 | */ | 55 | */ |
@@ -319,11 +324,14 @@ signals: | |||
319 | 324 | ||
320 | private slots: | 325 | private slots: |
321 | void systemMessage ( const QCString &, const QByteArray & ); | 326 | void systemMessage ( const QCString &, const QByteArray & ); |
327 | void playingStopped(); | ||
322 | 328 | ||
323 | protected: | 329 | protected: |
324 | void addPreHandler(QWSServer::KeyboardFilter*aFilter); | 330 | void addPreHandler(QWSServer::KeyboardFilter*aFilter); |
325 | void remPreHandler(QWSServer::KeyboardFilter*aFilter); | 331 | void remPreHandler(QWSServer::KeyboardFilter*aFilter); |
326 | void reloadButtonMapping(); | 332 | void reloadButtonMapping(); |
333 | void changeMixerForAlarm( int mixer, const char* file, Sound *snd); | ||
334 | |||
327 | /* ugly virtual hook */ | 335 | /* ugly virtual hook */ |
328 | virtual void virtual_hook( int id, void* data ); | 336 | virtual void virtual_hook( int id, void* data ); |
329 | }; | 337 | }; |
@@ -348,6 +356,9 @@ class ODeviceData { | |||
348 | QValueList <ODeviceButton> *m_buttons; | 356 | QValueList <ODeviceButton> *m_buttons; |
349 | uint m_holdtime; | 357 | uint m_holdtime; |
350 | QStrList *m_cpu_frequencies; | 358 | QStrList *m_cpu_frequencies; |
359 | |||
360 | /* values for changeMixerForAlarm */ | ||
361 | int m_sound, m_vol, m_mixer; | ||
351 | }; | 362 | }; |
352 | 363 | ||
353 | extern bool isQWS(); | 364 | extern bool isQWS(); |