equal
deleted
inserted
replaced
249 if (iFormat == EFormatTone) |
249 if (iFormat == EFormatTone) |
250 { |
250 { |
251 switch (iPlayerStatus) |
251 switch (iPlayerStatus) |
252 { |
252 { |
253 case ETonePlaying: |
253 case ETonePlaying: |
254 iTonePlayer->CancelPlay(); |
254 if (iTonePlayer) |
|
255 { |
|
256 iTonePlayer->CancelPlay(); |
|
257 } |
255 DoPlay(); |
258 DoPlay(); |
256 break; |
259 break; |
257 case EToneReady: |
260 case EToneReady: |
258 iPlayerStatus = ETonePlaying; |
261 iPlayerStatus = ETonePlaying; |
259 DoPlay(); |
262 DoPlay(); |
270 else if (iFormat == EFormatTts) |
273 else if (iFormat == EFormatTts) |
271 { |
274 { |
272 switch (iPlayerStatus) |
275 switch (iPlayerStatus) |
273 { |
276 { |
274 case ETonePlaying: |
277 case ETonePlaying: |
275 iTtsPlayer->Stop(); |
278 if (iTtsPlayer) |
|
279 { |
|
280 iTtsPlayer->Stop(); |
|
281 } |
276 DoPlay(); |
282 DoPlay(); |
277 break; |
283 break; |
278 case EToneReady: |
284 case EToneReady: |
279 iPlayerStatus = ETonePlaying; |
285 iPlayerStatus = ETonePlaying; |
280 DoPlay(); |
286 DoPlay(); |
318 // ----------------------------------------------------------------------------- |
324 // ----------------------------------------------------------------------------- |
319 // |
325 // |
320 void TMSRtAudioHdlr::ReStartPlaying() |
326 void TMSRtAudioHdlr::ReStartPlaying() |
321 { |
327 { |
322 TRACE_PRN_FN_ENT; |
328 TRACE_PRN_FN_ENT; |
323 if (iFormat == EFormatTone) |
329 if (iFormat == EFormatTone && iTonePlayer) |
324 { |
330 { |
325 iTonePlayer->Play(); |
331 iTonePlayer->Play(); |
326 iPlayerStatus = ETonePlaying; |
332 iPlayerStatus = ETonePlaying; |
327 } |
333 } |
328 else if (iFormat == EFormatTts) |
334 else if (iFormat == EFormatTts && iTtsPlayer) |
329 { |
335 { |
330 iTtsPlayer->Play(); |
336 iTtsPlayer->Play(); |
331 iPlayerStatus = ETonePlaying; |
337 iPlayerStatus = ETonePlaying; |
332 } |
338 } |
333 else |
339 else if (iFormat == EFormatSample && iSamplePlayer) |
334 { |
340 { |
335 iSamplePlayer->Play(); |
341 iSamplePlayer->Play(); |
336 iPlayerStatus = ETonePlaying; |
342 iPlayerStatus = ETonePlaying; |
337 } |
343 } |
338 TRACE_PRN_FN_EXT; |
344 TRACE_PRN_FN_EXT; |