author | sandman <sandman> | 2002-06-18 12:46:11 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-18 12:46:11 (UTC) |
commit | 61e2f9e5eb634b17ef480d79bdbcbc3a715990cb (patch) (unidiff) | |
tree | 013600ee0ababcc25f37ff98cede8f67cbdc9d2a /library | |
parent | e21322ab34a8df36344eece685e604abe4f83fc6 (diff) | |
download | opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.zip opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.tar.gz opie-61e2f9e5eb634b17ef480d79bdbcbc3a715990cb.tar.bz2 |
Moved platform specific things from custom-*.h #defines to virtual methods
in libopie/odevice.{h,cpp}
Minor fix in Sound + reformating
-rw-r--r-- | library/custom-ipaq.h | 60 | ||||
-rw-r--r-- | library/custom-sharp.h | 53 | ||||
-rw-r--r-- | library/sound.cpp | 11 |
3 files changed, 8 insertions, 116 deletions
diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h index 2886940..553b571 100644 --- a/library/custom-ipaq.h +++ b/library/custom-ipaq.h | |||
@@ -17,64 +17,4 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <unistd.h> | ||
21 | #include <stdio.h> | ||
22 | #include <signal.h> | ||
23 | #include <fcntl.h> | ||
24 | #include <sys/ioctl.h> | ||
25 | #include <linux/soundcard.h> | ||
26 | #include <qpe/resource.h> | ||
27 | #include <qsound.h> | ||
28 | #include <qpe/sound.h> | ||
29 | |||
30 | |||
31 | #ifndef QT_NO_SOUND | ||
32 | |||
33 | #define CUSTOM_SOUND_ALARM \ | ||
34 | { \ | ||
35 | int fd; \ | ||
36 | int vol; \ | ||
37 | bool vol_reset = false; \ | ||
38 | \ | ||
39 | if ((( fd = open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) || \ | ||
40 | (( fd = open ( "/dev/mixer", O_RDWR )) >= 0 )) { \ | ||
41 | \ | ||
42 | if ( ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) { \ | ||
43 | Config cfg ( "qpe" ); \ | ||
44 | cfg. setGroup ( "Volume" ); \ | ||
45 | \ | ||
46 | int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); \ | ||
47 | if ( volalarm < 0 ) \ | ||
48 | volalarm = 0; \ | ||
49 | else if ( volalarm > 100 ) \ | ||
50 | volalarm = 100; \ | ||
51 | volalarm |= ( volalarm << 8 ); \ | ||
52 | if ( ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 ) \ | ||
53 | vol_reset = true; \ | ||
54 | } \ | ||
55 | } \ | ||
56 | \ | ||
57 | Sound snd ( "alarm" ); \ | ||
58 | snd. play ( ); \ | ||
59 | while ( !snd. isFinished ( )) \ | ||
60 | qApp-> processEvents ( ); \ | ||
61 | \ | ||
62 | if ( fd >= 0 ) { \ | ||
63 | if ( vol_reset ) \ | ||
64 | ::ioctl ( fd, MIXER_WRITE( 0 ), &vol ); \ | ||
65 | ::close ( fd ); \ | ||
66 | } \ | ||
67 | } | ||
68 | |||
69 | #define CUSTOM_SOUND_KEYCLICK { QSound::play ( Resource::findSound ( "keysound" )); } | ||
70 | #define CUSTOM_SOUND_TOUCH { QSound::play ( Resource::findSound ( "screensound" )); } | ||
71 | |||
72 | #else | ||
73 | |||
74 | #define CUSTOM_SOUND_ALARM { ; } | ||
75 | #define CUSTOM_SOUND_KEYCLICK { ; } | ||
76 | #define CUSTOM_SOUND_TOUCH { ; } | ||
77 | |||
78 | |||
79 | #endif | ||
80 | 20 | ||
diff --git a/library/custom-sharp.h b/library/custom-sharp.h index 08f8a6f..3dab34f 100644 --- a/library/custom-sharp.h +++ b/library/custom-sharp.h | |||
@@ -36,63 +36,10 @@ | |||
36 | #include <fcntl.h> | 36 | #include <fcntl.h> |
37 | #include <sys/ioctl.h> | 37 | #include <sys/ioctl.h> |
38 | 38 | ||
39 | #define SHARP_DEV_IOCTL_COMMAND_START 0x5680 | ||
40 | |||
41 | /* --- for SHARP_BUZZER device --- */ | ||
42 | #define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) | ||
43 | #define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) | ||
44 | #define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) | ||
45 | #define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) | ||
46 | #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) | ||
47 | #define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) | ||
48 | #define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) | ||
49 | |||
50 | #define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ | ||
51 | #define SHARP_BUZ_KEYSOUND 2 /* key sound */ | ||
52 | #define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ | ||
53 | #define SHARP_PDA_WARNSOUND 4 /* warning occurred */ | ||
54 | #define SHARP_PDA_ERRORSOUND 5 /* error occurred */ | ||
55 | #define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ | ||
56 | #define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ | ||
57 | #define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ | ||
58 | #define SHARP_PDA_APPSTART 9 /* application start */ | ||
59 | #define SHARP_PDA_APPQUIT 10 /* application ends */ | ||
60 | #define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ | ||
61 | #define SHARP_BUZ_DAILY_ALARM 12 /* daily alarm */ | ||
62 | #define SHARP_BUZ_GOT_PHONE_CALL 13 /* phone call sound */ | ||
63 | #define SHARP_BUZ_GOT_MAIL 14 /* mail sound */ | ||
64 | |||
65 | |||
66 | #define CUSTOM_BUZZER( sound ) \ | ||
67 | { \ | ||
68 | static int fd = open( "/dev/sharp_buz", O_RDWR|O_NONBLOCK ); \ | ||
69 | ioctl( fd, SHARP_BUZZER_MAKESOUND, sound ); \ | ||
70 | } | ||
71 | |||
72 | #define CUSTOM_SOUND_ALARM CUSTOM_BUZZER( SHARP_BUZ_SCHEDULE_ALARM ) | ||
73 | #define CUSTOM_SOUND_KEYCLICK CUSTOM_BUZZER( SHARP_BUZ_KEYSOUND ) | ||
74 | #define CUSTOM_SOUND_TOUCH CUSTOM_BUZZER( SHARP_BUZ_TOUCHSOUND ) | ||
75 | |||
76 | 39 | ||
77 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
78 | #include <asm/sharp_char.h> | 41 | #include <asm/sharp_char.h> |
79 | 42 | ||
80 | // a bit awkward, as this value is defined in emailclient.cpp aswell... | ||
81 | #define LED_MAIL 0 | ||
82 | #define SHARP_LED_MAIL 9 | ||
83 | |||
84 | #define CUSTOM_LEDS( led, status ) \ | ||
85 | { \ | ||
86 | if ( led == LED_MAIL ) \ | ||
87 | led = SHARP_LED_MAIL; \ | ||
88 | static int fd = open( "/dev/sharp_led", O_RDWR|O_NONBLOCK ); \ | ||
89 | sharp_led_status leds; \ | ||
90 | memset(&leds, 0, sizeof(leds)); \ | ||
91 | leds.which = led; \ | ||
92 | leds.status = status; \ | ||
93 | ioctl( fd, SHARP_LED_SETSTATUS, (char*)&leds ); \ | ||
94 | } | ||
95 | |||
96 | #define QPE_HAVE_MEMALERTER | 43 | #define QPE_HAVE_MEMALERTER |
97 | 44 | ||
98 | #define QPE_MEMALERTER_IMPL \ | 45 | #define QPE_MEMALERTER_IMPL \ |
diff --git a/library/sound.cpp b/library/sound.cpp index 602fcf0..1ff3b3f 100644 --- a/library/sound.cpp +++ b/library/sound.cpp | |||
@@ -107,6 +107,7 @@ public: | |||
107 | filename(Resource::findSound(name)) | 107 | filename(Resource::findSound(name)) |
108 | { | 108 | { |
109 | loopsleft=0; | 109 | loopsleft=0; |
110 | ms = WAVsoundDuration(filename); | ||
110 | } | 111 | } |
111 | 112 | ||
112 | void playLoop(int loopcnt = -1) | 113 | void playLoop(int loopcnt = -1) |
@@ -114,7 +115,6 @@ public: | |||
114 | // needs server support | 115 | // needs server support |
115 | loopsleft = loopcnt; | 116 | loopsleft = loopcnt; |
116 | 117 | ||
117 | int ms = WAVsoundDuration(filename); | ||
118 | if ( ms ) | 118 | if ( ms ) |
119 | startTimer(ms > 50 ? ms-50 : 0); // 50 for latency | 119 | startTimer(ms > 50 ? ms-50 : 0); // 50 for latency |
120 | play(); | 120 | play(); |
@@ -123,10 +123,12 @@ public: | |||
123 | void timerEvent ( QTimerEvent *e ) | 123 | void timerEvent ( QTimerEvent *e ) |
124 | { | 124 | { |
125 | if (loopsleft >= 0) { | 125 | if (loopsleft >= 0) { |
126 | if (--loopsleft <= 0) | 126 | if ( --loopsleft <= 0 ) { |
127 | killTimer (e->timerId()); | 127 | killTimer (e->timerId()); |
128 | loopsleft = 0; | ||
128 | return; | 129 | return; |
129 | } | 130 | } |
131 | } | ||
130 | play(); | 132 | play(); |
131 | } | 133 | } |
132 | 134 | ||
@@ -138,7 +140,9 @@ public: | |||
138 | private: | 140 | private: |
139 | QString filename; | 141 | QString filename; |
140 | int loopsleft; | 142 | int loopsleft; |
143 | int ms; | ||
141 | }; | 144 | }; |
145 | |||
142 | #endif | 146 | #endif |
143 | 147 | ||
144 | Sound::Sound(const QString& name) | 148 | Sound::Sound(const QString& name) |
@@ -158,7 +162,6 @@ Sound::~Sound() | |||
158 | void Sound::play() | 162 | void Sound::play() |
159 | { | 163 | { |
160 | #ifndef QT_NO_SOUND | 164 | #ifndef QT_NO_SOUND |
161 | d->killTimers(); | ||
162 | d->playLoop(1); | 165 | d->playLoop(1); |
163 | #endif | 166 | #endif |
164 | } | 167 | } |
@@ -182,6 +185,8 @@ bool Sound::isFinished() const | |||
182 | { | 185 | { |
183 | #ifndef QT_NO_SOUND | 186 | #ifndef QT_NO_SOUND |
184 | return d->isFinished(); | 187 | return d->isFinished(); |
188 | #else | ||
189 | return true; | ||
185 | #endif | 190 | #endif |
186 | } | 191 | } |
187 | 192 | ||