FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/mmiSounds.c @ 92:c0052fe355d3
src/ui/bmi/*.[ch]: rm trailing white space
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 08 Nov 2020 06:39:16 +0000 |
| parents | 67bfe9f274f6 |
| children | 2cd1c1abdbb5 |
line wrap: on
line diff
--- a/src/ui/bmi/mmiSounds.c Sun Nov 08 05:12:05 2020 +0000 +++ b/src/ui/bmi/mmiSounds.c Sun Nov 08 06:39:16 2020 +0000 @@ -48,20 +48,20 @@ Apr 09, 2008 DRT: OMAPS00163752 including changes from OMAPS00151417 x0086292 Description: Rapid Scrolling of Ringer melodies will lockup phone Solution: Board froze when sending to many messages to AS task to stop audio, which froze - the board whenever there were too many messages in queue. Instead we can check if + the board whenever there were too many messages in queue. Instead we can check if audio is being played internally before sending stop message. Nov 06, 2007 DRT: OMAPS00151698 x0056422 Description: BMI requirments needed to support Bluetooth AVRCP in Locosto 5.x - Solution : In mfw_audResume, Pause, Stop functions, if BT is connected, send a callback. - In the case of audio play, handle the callback of START_IND from audio task and - post a callback to BT if expected. + Solution : In mfw_audResume, Pause, Stop functions, if BT is connected, send a callback. + In the case of audio play, handle the callback of START_IND from audio task and + post a callback to BT if expected. August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) Description: COMBO PLUS: Voice can not be heard in a call when MP3 tone was set Have an MP3 tone set as Ringer. Make a call to the target. - Accept the same, no voice can be heard from the calling - device or from the board that received + Accept the same, no voice can be heard from the calling + device or from the board that received Issue: Timing Synchronization Issue between BMI-ACI-L1. BMI calls sAT_A to accept the call. ACI then sends the RING_OFF signal to BMI, wherein BMI does a Ringer Stop. After this, ACI calls Vocoder @@ -75,31 +75,31 @@ April 25, 2007 DVT: OMAPS128828 x0061088(Prachi) Description: E1 Melody support - Solution: Now E1 Melody will be supported through ringer. + Solution: Now E1 Melody will be supported through ringer. Mar 30, 2007 REF: OMAPS00122691 x0039928 Description: COMBO: No melody heard on parsing over different volums in tones menu Solution: Filename is passed with complete path to the audio service api. - + Dec 05, 2006 ERT: OMAPS00101906 x0039928 Description: WAV format support on Locosto Solution: .wav files are populated. - + Nov 23, 2006 ERT: OMAPS00101348 x0039928 Description: Open BAE support for SMS for Nokia Smart Messaging melody Solution: .sms files are populated. Nov 07, 2006 ER: OMAPS00102732 x0pleela Description: FFS Support for Intel Sibley Flash - Intel 256+64 non-ADMUX (PF38F4050M0Y0C0Q) - Solution: Closing the opened directory if readdir is not successful and the new code + Solution: Closing the opened directory if readdir is not successful and the new code is under the compilation flag FF_MMI_RELIANCE_FFS - + 25/10/00 Original Condat(UK) BMI version. Sep 26, 2006 DR: OMAPS00096365 x0pleela Description: Play All Files option does not play all the midi files second time Solution:Reset the index to -1 to avoid playing only the last file in function sounds_midi_player_start_cb() - + Sep 11, 2006 DR: OMAPS00094182 xrashmic Description: midi and mp3 files is not being populated on accessing corresponding menu, but only during bootup Solution: Populate files on accessing the "browse files" list @@ -110,7 +110,7 @@ Jun 06, 2006 REF:ER OMAPS00080844 xdeepadh Description: duplication of midi files in ffs area - Solution: The code to create and load the midi files from FFS to LFS is + Solution: The code to create and load the midi files from FFS to LFS is removed. Nov 23, 2005 REF : DR OMAPS00057378 x0039928 @@ -118,11 +118,11 @@ Fix: Buffer memory allocated to copy the file contents is freed properly and copying file from FFS to LFS is not terminated if error is returned for just any one file, instead it tries to copy other files. - + Nov 21, 2005 REF:ER OMAPS00057430 nekkareb Description: AAC Ringer Implementation Solution: The Midi Ringer application has been enhanced to support AAC as ringer. - + Nov 04, 2005 REF:DRT OMAPS00053737 xdeepadh Description: MIDI Ringer Linear Flash Support. Solution: The Midi Ringer application has been enhanced to loadand play the midi files from LFS. @@ -154,13 +154,13 @@ Nov 29, 2004 REF: CRR 25051 xkundadu Description: INCALL SCREEN ?ADJUSTING THE VOLUME - Fix: Added volume level list linked to up/down keys. - User can select the speaker volume among those levels. + Fix: Added volume level list linked to up/down keys. + User can select the speaker volume among those levels. Dec 23, 2005 REF: SR13873 x0020906 Description: Selection configurable ring tones. Added for NEPTUNE Fix: When moving cursor in menu, stop old and play new ringtone. - When press of back / clear / hang up stop playing the ringtone. - Initially when the get into list, start playing first ringtone - As cursor is positioned. + When press of back / clear / hang up stop playing the ringtone. + Initially when the get into list, start playing first ringtone - As cursor is positioned. $End @@ -215,7 +215,7 @@ #include "mfw_sms.h" //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER #include "mfw_midi.h" #ifdef FF_MMI_MIDI_FORMAT @@ -260,7 +260,7 @@ #include "mmiColours.h" //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER #include "mmisamplemidifiles.h" #endif @@ -276,7 +276,7 @@ // Aug 05, 2005 xdeepadh #ifdef FF_MMI_AUDIO_PROFILE -extern UBYTE mfwAudPlay;//flag for audio +extern UBYTE mfwAudPlay;//flag for audio #endif /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- Start */ @@ -355,7 +355,7 @@ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER extern UBYTE mfw_player_exit_flag;//Flag to check the playall option extern int mfw_player_currently_playing_idx;//The current playing file index @@ -392,11 +392,11 @@ static int keyEvent( MfwEvt e, MfwKbd *kc ); static int keyEventLong( MfwEvt e, MfwKbd *kc ); -/* x0039928 - Lint warning fix +/* x0039928 - Lint warning fix static void ( *show )( void ); */ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER static int playCurrentSound( MfwEvt e, MfwTim *tc ); #endif static int getCallingMenu( MfwEvt e, MfwTim *tc ); @@ -550,9 +550,9 @@ /* Maintain vibrator state information here */ -/* x0039928 - Lint warning removal -static MfwHnd VibratorTimer; -static UBYTE Vibrating = NOT_VIBRATING; +/* x0039928 - Lint warning removal +static MfwHnd VibratorTimer; +static UBYTE Vibrating = NOT_VIBRATING; static UBYTE vibrator_counter=0; */ /* General state information @@ -567,7 +567,7 @@ /* Tune details */ static int CurrentTune = 0; -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER static int LastTune = 0; #endif @@ -593,7 +593,7 @@ *$Function: setDefaultSound * *$Description: This function will read from Flash during boot up and updated the -* current ringer structure. So after reset the stored tones will get +* current ringer structure. So after reset the stored tones will get * played. * *$Returns: none @@ -666,9 +666,9 @@ { TRACE_FUNCTION("volMenuItemSelected"); - + /* Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER /* Save the volume for a given ringer mode */ TRACE_EVENT_P1("Volume set is %d",current.volumeSetting); mfw_ringer_set_volume(get_ringer_mode(),(T_AS_VOLUME)getCurrentVoulmeSettings()); @@ -711,8 +711,8 @@ TRACE_FUNCTION("clearScrollSelectMenuItem"); scrollSelectMenuItem=FALSE; // soundReason = SoundsNone; MZ this flag cleared when user exits the melody/Volume menu. -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER mfw_player_stop(sounds_midi_player_stop_cb); #else stopPlayingMelody(); @@ -735,8 +735,8 @@ { TRACE_FUNCTION("soundsSetVolume"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER //Create 0.5 second ringer delay timer. hPlayerStartTimer = timCreate( 0, TIMHALFSECOND, (MfwCb)playCurrentVolumeTone); //Set the audiopath to speaker. @@ -746,14 +746,14 @@ //Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh //Set the Mp3 Parameters .Size of the file where the melody must start is set 0(from beginning) //and channel is set to stereo. -#ifdef FF_MP3_RINGER +#ifdef FF_MP3_RINGER mfw_player_mp3_set_params(MP3_PLAY_FROM_START,MP3_CHANNEL_STEREO); #endif //FF_MP3_RINGER //Nov 21, 2005 REF:ER OMAPS00057430 nekkareb //Set the AAC Parameters .Size of the file where the melody must start is set 0(from beginning) //and channel is set to stereo. -#ifdef FF_AAC_RINGER +#ifdef FF_AAC_RINGER mfw_player_aac_set_params(AAC_PLAY_FROM_START,AAC_CHANNEL_STEREO); #endif //FF_AAC_RINGER @@ -793,8 +793,8 @@ void IdleScreenVolumeTimer() { TRACE_FUNCTION("IdleScreenVolumeTimer"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER //Create 0.5 second ringer delay timer. hPlayerStartTimer = timCreate( 0, TIMHALFSECOND, (MfwCb)playCurrentVolumeTone); //Set the audiopath to speaker. @@ -833,7 +833,7 @@ { // Aug 30, 2005 REF: SPR 34018 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER T_AS_RINGER_INFO * ringer_info; T_AS_RINGER_INFO temp_ringer_info; @@ -850,10 +850,10 @@ mfw_ringer_set_volume(AS_RINGER_MODE_IC,(T_AS_VOLUME)getCurrentVoulmeSettings()); #else stopPlayingMelody(); - oldVolumeSetting = current.volumeSetting; - current.volumeSetting = SILENT_VOLUME; + oldVolumeSetting = current.volumeSetting; + current.volumeSetting = SILENT_VOLUME; audio_SetAmplf (AUDIO_BUZZER, current.volumeSetting); -#endif +#endif } /******************************************************************************* @@ -872,13 +872,13 @@ TRACE_FUNCTION("restoreSilentModeVolume"); // Aug 30, 2005 REF: SPR 34018 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER //Set the volume back to the old one TRACE_EVENT_P1("oldVolumeSetting set is %d",oldVolumeSetting); mfw_ringer_set_volume(AS_RINGER_MODE_IC,(T_AS_VOLUME)oldVolumeSetting); #else stopPlayingMelody(); - current.volumeSetting =oldVolumeSetting; + current.volumeSetting =oldVolumeSetting; audio_SetAmplf (AUDIO_BUZZER, current.volumeSetting); #endif } @@ -896,8 +896,8 @@ *******************************************************************************/ void soundsVolSilent(void) { -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER //Display silent mode in the idle screen only for the incoming call volume. if(soundReason == MelodySelect || soundReason == SettingVolume) { @@ -910,8 +910,8 @@ #endif TRACE_EVENT("soundsVolSilent"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER current.volumeSetting =(UBYTE)AS_VOLUME_SILENT; stopVolumeTimer(); startVolumeTimer(); @@ -929,20 +929,20 @@ audio_SetAmplf (AUDIO_BUZZER, current.volumeSetting); #ifdef FF_MMI_RINGTONE /* MSL Ring tone play */ - audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); #else -/* RAVI - 20-1-2006 */ +/* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD /* Store the currently stored volume content */ - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); #else /* API - 04/09/03 - SPR2447 - Remove the call to AUDIO_PLAY_INFINITE and replace with AUDIO_PLAY_ONCE*/ - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); /* API - 04/09/03 - SPR2447 - END*/ -#endif +#endif /* END RAVI */ -#endif +#endif } else @@ -951,8 +951,8 @@ volumeSetting2Pcm=FALSE; } #endif - - + + } /******************************************************************************* @@ -971,8 +971,8 @@ FFS_flashData.settings_status &= ~SettingsSilentMode; flash_write(); TRACE_EVENT("soundsVolLow"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER current.volumeSetting =(UBYTE)AS_VOLUME_LOW; stopVolumeTimer(); startVolumeTimer(); @@ -989,19 +989,19 @@ audio_SetAmplf (AUDIO_BUZZER, current.volumeSetting); #ifdef FF_MMI_RINGTONE /* MSL Ring tone play */ - audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); #else -/* RAVI - 20-1-2006 */ +/* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); #else /* API - 04/09/03 - SPR2447 - Remove the call to AUDIO_PLAY_INFINITE and replace with AUDIO_PLAY_ONCE*/ - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); - /* API - 04/09/03 - SPR2447 - END*/ -#endif + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); + /* API - 04/09/03 - SPR2447 - END*/ +#endif /* END RAVI */ -#endif +#endif } else @@ -1010,8 +1010,8 @@ volumeSetting2Pcm=FALSE; } #endif - - + + } /******************************************************************************* @@ -1030,8 +1030,8 @@ FFS_flashData.settings_status &= ~SettingsSilentMode; flash_write(); TRACE_EVENT("soundsVolMedium"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER current.volumeSetting =(UBYTE)AS_VOLUME_MEDIUM; stopVolumeTimer(); startVolumeTimer(); @@ -1048,17 +1048,17 @@ audio_SetAmplf (AUDIO_BUZZER, current.volumeSetting); #ifdef FF_MMI_RINGTONE /* MSL Ring Tone Play */ - audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); #else -/* RAVI - 20-1-2006 */ +/* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); #else /* API - 04/09/03 - SPR2447 - Remove the call to AUDIO_PLAY_INFINITE and replace with AUDIO_PLAY_ONCE*/ - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); /* API - 04/09/03 - SPR2447 - END*/ -#endif +#endif /* END RAVI */ #endif @@ -1069,8 +1069,8 @@ volumeSetting2Pcm=FALSE; } #endif - - + + } /******************************************************************************* @@ -1089,10 +1089,10 @@ FFS_flashData.settings_status &= ~SettingsSilentMode; flash_write(); - + TRACE_EVENT("soundsVolHigh"); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER current.volumeSetting =(UBYTE)AS_VOLUME_HIGH; stopVolumeTimer(); startVolumeTimer(); @@ -1113,14 +1113,14 @@ audio_PlaySoundID(AUDIO_BUZZER, CALLTONE_SELECT, 0, AUDIO_PLAY_ONCE); #else -/* RAVI - 20-1-2006 */ +/* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); -#else + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); +#else /* API - 04/09/03 - SPR2447 - Remove the call to AUDIO_PLAY_INFINITE and replace with AUDIO_PLAY_ONCE*/ audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); - /* API - 04/09/03 - SPR2447 - END*/ -#endif + /* API - 04/09/03 - SPR2447 - END*/ +#endif /* END RAVI */ #endif @@ -1131,7 +1131,7 @@ volumeSetting2Pcm=FALSE; } #endif - + } /******************************************************************************* @@ -1146,7 +1146,7 @@ *******************************************************************************/ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER void soundsVolInc(void) { FFS_flashData.settings_status &= ~SettingsSilentMode; @@ -1168,12 +1168,12 @@ /* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); -#else + audio_PlaySoundID(AUDIO_BUZZER, current.ringer, current.volumeSetting, AUDIO_PLAY_ONCE); +#else /* API - 04/09/03 - SPR2447 - Remove the call to AUDIO_PLAY_INFINITE and replace with AUDIO_PLAY_ONCE*/ audio_PlaySoundID(AUDIO_BUZZER, current.ringer, 0, AUDIO_PLAY_ONCE); - /* API - 04/09/03 - SPR2447 - END*/ -#endif + /* API - 04/09/03 - SPR2447 - END*/ +#endif /* END RAVI */ #endif @@ -1352,12 +1352,12 @@ */ if ( LastTune ) { - /* To stop playing the previous ring tone - RAVI - 23-12-2005 */ + /* To stop playing the previous ring tone - RAVI - 23-12-2005 */ #ifdef NEPTUNE_BOARD #ifdef FF_MMI_RINGTONE /*MSL Stop */ - audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); + audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); #else - audio_StopSoundbyID( AUDIO_BUZZER, LastTune - 1 ); + audio_StopSoundbyID( AUDIO_BUZZER, LastTune - 1 ); #endif #else audio_StopSoundbyID( AUDIO_BUZZER, LastTune ); @@ -1384,7 +1384,7 @@ *******************************************************************************/ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER static void startPlayingMelody(UBYTE melody_id) { #ifdef NEPTUNE_BOARD @@ -1405,7 +1405,7 @@ switch (scrollVolumeSetting) { case 0: - bVolumeSetting = SILENT_VOLUME; + bVolumeSetting = SILENT_VOLUME; break; case 1: bVolumeSetting = LOW_VOLUME; @@ -1423,19 +1423,19 @@ bVolumeSetting = LOW_VOLUME; break; } - audio_PlaySoundID(AUDIO_BUZZER, melody_id, (BYTE)bVolumeSetting, + audio_PlaySoundID(AUDIO_BUZZER, melody_id, (BYTE)bVolumeSetting, AUDIO_PLAY_ONCE); } - else + else { - audio_PlaySoundID(AUDIO_BUZZER, melody_id, (BYTE)current.volumeSetting, + audio_PlaySoundID(AUDIO_BUZZER, melody_id, (BYTE)current.volumeSetting, AUDIO_PLAY_ONCE); } #else audio_PlaySoundID(AUDIO_BUZZER, melody_id, (BYTE)current.volumeSetting, AUDIO_PLAY_ONCE); #endif - /* END - RAVI - 20-1-2006 */ + /* END - RAVI - 20-1-2006 */ #endif } @@ -1455,18 +1455,18 @@ *******************************************************************************/ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER static void soundsPlayRinger( int melody_id ) { CurrentTune = melody_id; if (LastTune) { #ifdef FF_MMI_RINGTONE /*MSL Stop */ - audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); - #else + audio_StopSoundbyID( AUDIO_BUZZER, CALLTONE_SELECT); + #else audio_StopSoundbyID (AUDIO_BUZZER,LastTune ); #endif - } + } vsi_t_sleep(0, 5); if (current.volumeSetting == increasing) @@ -1478,8 +1478,8 @@ /* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, CurrentTune, current.volumeSetting, AUDIO_PLAY_ONCE); -#else + audio_PlaySoundID(AUDIO_BUZZER, CurrentTune, current.volumeSetting, AUDIO_PLAY_ONCE); +#else audio_PlaySoundID ( AUDIO_BUZZER,CurrentTune, 0 , AUDIO_PLAY_CRESCENDO ); #endif /* END RAVI */ @@ -1495,8 +1495,8 @@ /* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(AUDIO_BUZZER, CurrentTune, current.volumeSetting, AUDIO_PLAY_ONCE); -#else + audio_PlaySoundID(AUDIO_BUZZER, CurrentTune, current.volumeSetting, AUDIO_PLAY_ONCE); +#else audio_PlaySoundID ( AUDIO_BUZZER,CurrentTune, 0, AUDIO_PLAY_ONCE ); #endif /* END RAVI */ @@ -1594,7 +1594,7 @@ T_MELODY_INFO * data = (T_MELODY_INFO *)win_data->user; UBYTE i; UBYTE numberOfMelodies=0; -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER UBYTE file_count=0; #endif ListWinInfo * mnu_data = (ListWinInfo *)parameter; @@ -1617,7 +1617,7 @@ return; } /*Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER numberOfMelodies = sounds_midi_return_file_number(); TRACE_EVENT_P1("numberOfMelodies is %d",numberOfMelodies); /*In case no files have been loaded display info message */ @@ -1645,8 +1645,8 @@ data->menu_list_data->List[i].flagFunc = item_flag_none; /* Display the midi file names in the list */ - /*Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER + /*Apr 05, 2005 REF: ENH 29994 xdeepadh */ +#ifdef FF_MIDI_RINGER data->menu_list_data->List[i].str = (char *)sounds_midi_return_file_name(file_count++); #else data->menu_list_data->List[i].str = (char *)MelodyTable[i]; @@ -1665,35 +1665,35 @@ data->menu_list_data->Strings = TRUE; data->menu_list_data->Attr = (MfwMnuAttr*)&melody_menuAttrib; /* Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER data->menu_list_data->Attr->hdrId = TxtMidiFileTitle; #endif data->menu_list_data->autoDestroy = FALSE; listDisplayListMenu(win, data->menu_list_data,(ListCbFunc)MelodyList_cb,0); -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER selected_tone=data->menu_list_data->ListPosition-1; stopPlayerTimer(); startPlayerTimer(); #endif /* Start playing first ringtone on initial list display - RAVI - 23-12-2005 */ -#ifdef NEPTUNE_BOARD +#ifdef NEPTUNE_BOARD if(getMelodyListStatus()== TRUE) { stopPlayingMelody (); startPlayingMelody(0); /* Play the first menu item which is being selected */ LastTune = FIRST_TONE_PLAYED; /* First Menu Item - Ringer is selected */ } -#endif -/* RAVI - 23-12-2005 */ +#endif +/* RAVI - 23-12-2005 */ break; case E_START_MELODY: /* Apr 05, 2005 REF: ENH 29994 xdeepadh */ /* Play the midi file when the user has scrolled */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER selected_tone=mnu_data->MenuData.ListPosition; stopPlayerTimer(); startPlayerTimer(); @@ -1701,12 +1701,12 @@ /* When cursor moved - Stop playing old and start playing new - RAVI - 23-12-2005 */ #ifndef NEPTUNE_BOARD - startPlayingMelody(mnu_data->MenuData.ListPosition); + startPlayingMelody(mnu_data->MenuData.ListPosition); #else - stopPlayingMelody(); - startPlayingMelody(mnu_data->MenuData.ListPosition); + stopPlayingMelody(); + startPlayingMelody(mnu_data->MenuData.ListPosition); LastTune = mnu_data->MenuData.ListPosition+1; /* Store the late tune in global variable */ -#endif /* END RAVI */ +#endif /* END RAVI */ #endif break; @@ -1734,7 +1734,7 @@ T_MFW_WIN * win_data = ((T_MFW_HDR *)Parent)->data; T_MELODY_INFO * data = (T_MELODY_INFO *)win_data->user; /*Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER T_AS_PLAYER_TYPE player_type; #ifdef FF_MIDI_LOAD_FROM_MEM @@ -1750,8 +1750,8 @@ /*Stop playing ringtone on press of BACK/ CLEAR/ HANGUP - RAVI - 23-12-2005 - SR 13873 */ #ifdef NEPTUNE_BOARD - stopPlayingMelody(); -#endif + stopPlayingMelody(); +#endif /* END RAVI - 23-12-2005 */ } @@ -1780,7 +1780,7 @@ break; case SettingSMSTone: - + #ifdef FF_MIDI_RINGER //Use Midi Player #ifdef FF_MIDI_LOAD_FROM_MEM //If ULC memory_pointer=sounds_midi_return_memory_location(ListData->ListPosition); @@ -1794,10 +1794,10 @@ #else/*Use Buzzer*/ stopPlayingMelody(); current.SMSTone = ListData->ListPosition; /* For SMS tones - starting from 40 */ -/* Store in FFS - RAVI - 23-12-2005 - SR 13873 */ +/* Store in FFS - RAVI - 23-12-2005 - SR 13873 */ #ifdef NEPTUNE_BOARD FFS_flashData.SMSTone= current.SMSTone; - flash_write(); + flash_write(); #endif /* END RAVI - 23-12-2005 */ #endif @@ -1818,10 +1818,10 @@ #else/*Use Buzzer*/ // need to check alarm status MZ. current.AlarmOn = ListData->ListPosition; -/* Store in FFS - RAVI - 23-12-2005 - SR 13873 */ +/* Store in FFS - RAVI - 23-12-2005 - SR 13873 */ #ifdef NEPTUNE_BOARD FFS_flashData.AlarmOn= current.AlarmOn; - flash_write(); + flash_write(); #endif /* END RAVI - 23-12-2005 */ #endif @@ -1831,13 +1831,13 @@ } /* Apr 05, 2005 REF: ENH 29994 xdeepadh */ /* Store selected melody in PCM storage. */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER sounds_show_info(0, TxtSelected, TxtNull, NULL); #endif } - -#ifdef FF_MIDI_RINGER - stopPlayerTimer(); + +#ifdef FF_MIDI_RINGER + stopPlayerTimer(); // DRT:OMAPS00163752 including changes from OMAPS00151417 (x0086292) //mfw_player_stop(sounds_midi_player_stop_cb); #else @@ -1882,8 +1882,8 @@ /* * Free Memory */ -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER numberOfMelodies = sounds_midi_return_file_number(); #else numberOfMelodies = resource_GetListCount(RES_MELODY); @@ -1895,8 +1895,8 @@ FREE_MEMORY ((void *)data->menu_list_data, sizeof (ListMenuData)); } FREE_MEMORY ((void *)data, sizeof (T_MELODY_INFO)); -//Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +//Apr 05, 2005 REF: ENH 29994 xdeepadh +#ifdef FF_MIDI_RINGER //Delete the timer used for scrolling if(hPlayerStartTimer!=NULL) timDelete(hPlayerStartTimer); @@ -2142,7 +2142,7 @@ *******************************************************************************/ //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifndef FF_MIDI_RINGER +#ifndef FF_MIDI_RINGER static int playCurrentSound( MfwEvt e, MfwTim *tc ) { soundsPlayRinger(current.ringer); @@ -2468,13 +2468,13 @@ If volume settings dialog timed out while in the incoming call, allow the ringer to continue ringing. MZ 9/4/01 */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER mfw_ringer_start(AS_RINGER_MODE_IC,true,sounds_midi_ringer_start_cb); #else - /* Volume Setting for Silent */ + /* Volume Setting for Silent */ startPlayingMelody(getCurrentRingerSettings()); #endif - + } else if (idle_data->info_win != NULL ) @@ -2501,7 +2501,7 @@ * * @return None * -* @see +* @see */ /* =========================================================== */ @@ -2513,21 +2513,21 @@ /* ===========================================================*/ /** * volumeMenuScrollUp () when menu button is moved up then this function will get called which -* decrements value for the global variable used to maintain the volume setting while scrolling +* decrements value for the global variable used to maintain the volume setting while scrolling * through the menu. * * @param None. * * @return None * -* @see +* @see */ /* =========================================================== */ void volumeMenuScrollUp (void) { /* Decrement Volume setting when scroll up */ scrollVolumeSetting = scrollVolumeSetting - 1 ; - + if (scrollVolumeSetting < SILENT_SETTING) { scrollVolumeSetting = MAX_VOLUME_SETTING; @@ -2541,21 +2541,21 @@ /* ===========================================================*/ /** * volumeMenuScrollDown () when menu button is moved down then this function will get called which -* increments value for the global variable used to maintain the volume setting while scrolling +* increments value for the global variable used to maintain the volume setting while scrolling * through the menu. * * @param None. * * @return None * -* @see +* @see */ /* =========================================================== */ void volumeMenuScrollDown (void) { /* Increment Volume setting when scroll down */ scrollVolumeSetting = scrollVolumeSetting + 1; - + if (scrollVolumeSetting > MAX_VOLUME_SETTING) { scrollVolumeSetting = SILENT_SETTING; @@ -2567,14 +2567,14 @@ /* ===========================================================*/ /** -* volumeMenuStartPlaying () Will start playing the default melody with the specified volume +* volumeMenuStartPlaying () Will start playing the default melody with the specified volume * control. * * @param None. * * @return None * -* @see +* @see */ /* =========================================================== */ void volumeMenuStartPlaying(void) @@ -2588,14 +2588,14 @@ /* ===========================================================*/ /** -* volumeMenuStopPlaying () Will stop playing the default melody with the specified volume +* volumeMenuStopPlaying () Will stop playing the default melody with the specified volume * control. * * @param None. * * @return None * -* @see +* @see */ /* =========================================================== */ void volumeMenuStopPlaying() @@ -2603,7 +2603,7 @@ if(soundReason == SettingVolume) { stopPlayingMelody (); - } + } } #endif /* END RAVI */ @@ -2674,7 +2674,7 @@ { if(call_data.call_direction == MFW_CM_MTC) { - /* RAVI - 20-1-2006 */ + /* RAVI - 20-1-2006 */ #ifdef NEPTUNE_BOARD ; /* do nothing */ #else @@ -2687,7 +2687,7 @@ #ifdef NEPTUNE_BOARD ; /* do nothing */ #else - hRingerVolSettingTimeOut = timCreate(idle_data->win, TIM4SECOND, (MfwCb)volumeSettingTimeOut); + hRingerVolSettingTimeOut = timCreate(idle_data->win, TIM4SECOND, (MfwCb)volumeSettingTimeOut); #endif } } @@ -2702,7 +2702,7 @@ lastVolumeSetting = current.volumeSetting; #endif - + #ifndef NEPTUNE_BOARD timStart(hRingerVolSettingTimeOut); #endif @@ -2727,16 +2727,16 @@ T_MFW_HND win; T_MFW_HND parent_win = mfw_parent(mfw_header()); /*Apr 05, 2005 REF: ENH 29994 xdeepadh */ -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER int numberOfMelodies=0; - + TRACE_EVENT("soundsRinger"); //Sep 11, 2006 DR: OMAPS00094182 xrashmic TRACE_EVENT("populating files"); sounds_midi_init(); - + numberOfMelodies = sounds_midi_return_file_number(); TRACE_EVENT_P1("numberOfMelodies is %d",numberOfMelodies); @@ -2754,21 +2754,21 @@ //Nov 02, 2005 REF:ER OMAPS00039044 xdeepadh //Set the Mp3 Parameters .Size of the file where the melody must start is set 0(from beginning) //and channel is set to stereo. -#ifdef FF_MP3_RINGER +#ifdef FF_MP3_RINGER mfw_player_mp3_set_params(MP3_PLAY_FROM_START,MP3_CHANNEL_STEREO); #endif //FF_MP3_RINGER //Nov 21, 2005 REF:ER OMAPS00057430 nekkareb //Set the AAC Parameters .Size of the file where the melody must start is set 0(from beginning) //and channel is set to stereo. -#ifdef FF_AAC_RINGER +#ifdef FF_AAC_RINGER mfw_player_aac_set_params(AAC_PLAY_FROM_START,AAC_CHANNEL_STEREO); #endif //FF_AAC_RINGER hPlayerStartTimer = timCreate( 0, TIMHALFSECOND, (MfwCb)playCurrentMelody); win = buildMelodyMenu(parent_win); - + if (win NEQ NULL) { SEND_EVENT (win, E_INIT, 0, 0); @@ -3086,8 +3086,8 @@ /* RAVI - 20-1-2006 */ /* play KeypadClick */ #ifdef NEPTUNE_BOARD - audio_PlaySoundID(0, TONES_KEYBEEP, current.volumeSetting, AUDIO_PLAY_ONCE); -#else + audio_PlaySoundID(0, TONES_KEYBEEP, current.volumeSetting, AUDIO_PLAY_ONCE); +#else audio_PlaySoundID(0, TONES_KEYBEEP, 5, AUDIO_PLAY_ONCE ); /* GW#2355 /CQ11341 */ #endif /* END RAVI */ @@ -3362,61 +3362,61 @@ void SetVolumeLevel1(void) { - - + + FFS_flashData.output_volume = OutVolumeLevel1; - // Set the volume + // Set the volume mmeSetVolume (1, FFS_flashData.output_volume); //write the value to the FFS flash_write(); - + } void SetVolumeLevel2(void) { - - + + FFS_flashData.output_volume = OutVolumeLevel2; - // Set the volume + // Set the volume mmeSetVolume (1, FFS_flashData.output_volume); //write the value to the FFS flash_write(); - + } void SetVolumeLevel3(void) { - - + + FFS_flashData.output_volume = OutVolumeLevel3; - // Set the volume + // Set the volume mmeSetVolume (1, FFS_flashData.output_volume); //write the value to the FFS flash_write(); - + } void SetVolumeLevel4(void) { - - + + FFS_flashData.output_volume = OutVolumeLevel4; - // Set the volume + // Set the volume mmeSetVolume (1, FFS_flashData.output_volume); //write the value to the FFS flash_write(); - + } void SetVolumeLevel5(void) { - - + + FFS_flashData.output_volume = OutVolumeLevel5; - // Set the volume + // Set the volume mmeSetVolume (1, FFS_flashData.output_volume); //write the value to the FFS flash_write(); - + } //Apr 05, 2005 REF: ENH 29994 xdeepadh -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER /******************************************************************************* $Function: sounds_midi_init @@ -3431,7 +3431,7 @@ void sounds_midi_init(void) { TRACE_FUNCTION("sounds_init"); -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER #ifdef FF_MIDI_LOAD_FROM_MEM midi_files_count=MIDI_MAX_FILES; #else @@ -3503,7 +3503,7 @@ //file_count will be used to populate the array index for (i = 0; ffs_readdir (&dir, dest_name_p, 100) > 0x0; i++) { - + (file_names[files_count]) = (char*)mfwAlloc(strlen(dest_name_p) + 1); if(file_names[files_count] != NULL) { @@ -3535,54 +3535,54 @@ #ifdef FF_MMI_MIDI_FORMAT //If XMF is supported -#ifdef PAL_ENABLE_XMF +#ifdef PAL_ENABLE_XMF if ( (strcmp(fileExt, "xmf") == 0)) { strcpy (file_names[files_count], dest_name_p); files_count++; } else -#endif //PAL_ENABLE_XMF +#endif //PAL_ENABLE_XMF //If IMELODY is supported -#ifdef PAL_ENABLE_IMELODY +#ifdef PAL_ENABLE_IMELODY if ( (strcmp(fileExt, "imy") == 0)) { strcpy (file_names[files_count], dest_name_p); files_count++; } else -#endif //PAL_ENABLE_IMELODY +#endif //PAL_ENABLE_IMELODY //If SMAF is supported -#ifdef PAL_ENABLE_SMAF_MA3 +#ifdef PAL_ENABLE_SMAF_MA3 if ( (strcmp(fileExt, "mmf") == 0)) { strcpy (file_names[files_count], dest_name_p); files_count++; } else -#endif ////PAL_ENABLE_SMAF_MA3 +#endif ////PAL_ENABLE_SMAF_MA3 //If MIDI is supported -#ifdef PAL_ENABLE_MIDI_NORMALIZER +#ifdef PAL_ENABLE_MIDI_NORMALIZER if ( (strcmp(fileExt, "mid") == 0)) { strcpy (file_names[files_count], dest_name_p); files_count++; } else -#endif ////PAL_ENABLE_MIDI_NORMALIZER +#endif ////PAL_ENABLE_MIDI_NORMALIZER //Sep 12, 2005 REF: SPR 33977 xdeepadh //mxmf file format has been supported -#ifdef PAL_ENABLE_XMF +#ifdef PAL_ENABLE_XMF if ( (strcmp(fileExt, "mxmf") == 0)) { strcpy (file_names[files_count], dest_name_p); files_count++; } else -#endif //PAL_ENABLE_XMF +#endif //PAL_ENABLE_XMF /* Nov 23, 2006 ERT: OMAPS00101348 x0039928 Fix: .sms files are populated */ #ifdef PAL_ENABLE_SMS @@ -3602,7 +3602,7 @@ files_count++; } else -#endif //PAL_ENABLE_DIGITAL_AUDIO +#endif //PAL_ENABLE_DIGITAL_AUDIO #endif ; @@ -3615,12 +3615,12 @@ } } - + //x0pleela 07 Nov, 2006 DVT: OMAPS00102732 //Adding the MMI compilation flag FF_MMI_RELIANCE_FFS - //x0pleela 31 Oct, 2006 + //x0pleela 31 Oct, 2006 //Closing the directory aa per the new FFS logic -#ifdef FF_MMI_RELIANCE_FFS +#ifdef FF_MMI_RELIANCE_FFS ffs_closedir(dir); #endif TRACE_EVENT_P1("read files_count is %d",files_count); @@ -3651,14 +3651,14 @@ } file_names[i]=NULL; } - + } /******************************************************************************* $Function: sounds_midi_return_file_number - $Description: returns the file count + $Description: returns the file count $Returns: Count of the Midi files @@ -3668,20 +3668,20 @@ int sounds_midi_return_file_number(void) { TRACE_FUNCTION("sounds_midi_return_file_number"); - + if(midi_files_count<=0) return 0; else - return midi_files_count; + return midi_files_count; } /******************************************************************************* $Function: sounds_midi_return_file_name - $Description: Returns the file name - - $Returns: Name of the file + $Description: Returns the file name + + $Returns: Name of the file $Arguments: index:The index of the file, whose name has to be retrieved @@ -3699,7 +3699,7 @@ return (char *) midi_file_names[index]; #endif - + } /******************************************************************************* @@ -3723,28 +3723,28 @@ if (((T_AS_START_IND *)parameter)->header.msg_id == AS_START_IND ) { tGlobalBmiBtStruct.tAudioState = FM_AUD_PLAY; - if(tGlobalBmiBtStruct.bConnected != BMI_BT_NOTCONNECTED) - { + if(tGlobalBmiBtStruct.bConnected != BMI_BT_NOTCONNECTED) + { if( NULL != tGlobalBmiBtStruct.BmiEventCallback) tGlobalBmiBtStruct.BmiEventCallback(BMI_EVENT_USER_PLAY); tGlobalBmiBtStruct.tCmdSrc == BMI_BT_COMMAND_NONE; - } + } } #endif//FF_MMI_A2DP_AVRCP /* OMAPS00151698, x0056422 */ - + if (((T_AS_STOP_IND *)parameter)->header.msg_id == AS_STOP_IND ) { /* OMAPS00151698, x0056422 */ #ifdef FF_MMI_A2DP_AVRCP tGlobalBmiBtStruct.tAudioState = FM_AUD_NONE; - if(tGlobalBmiBtStruct.bConnected != BMI_BT_NOTCONNECTED) - { + if(tGlobalBmiBtStruct.bConnected != BMI_BT_NOTCONNECTED) + { if( NULL != tGlobalBmiBtStruct.BmiEventCallback) tGlobalBmiBtStruct.BmiEventCallback(BMI_EVENT_USER_STOP); tGlobalBmiBtStruct.tCmdSrc == BMI_BT_COMMAND_NONE; - } + } #endif//FF_MMI_A2DP_AVRCP /* OMAPS00151698, x0056422 */ // Aug 05, 2005 xdeepadh @@ -3752,7 +3752,7 @@ //configure the audio to voice path. mfwAudPlay = FALSE; mfw_unset_stereo_path(mfw_get_current_audioDevice()); - #endif + #endif } } @@ -3771,9 +3771,9 @@ void sounds_midi_ringer_stop_cb(void *parameter) { - + /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- Start */ - + E_IN_CALL_RINGER_STATUS eStatus = 0; TRACE_EVENT("sounds_midi_ringer_stop_cb"); @@ -3787,10 +3787,10 @@ { /* Vocoder Enable */ mfw_aud_l1_enable_vocoder(); - + bmi_incomingcall_set_ringer_status(BMI_INCOMING_CALL_NONE); } - + /*August 01, 2007 DR: OMAPS00137399 x0080701 (Bharat) -- End */ // Aug 05, 2005 xdeepadh @@ -3840,7 +3840,7 @@ mfw_player_currently_playing_idx++; TRACE_EVENT_P1("mfw_player_currently_playing_idx is %d",mfw_player_currently_playing_idx); mfw_player_save_selected_file_idx(mfw_player_currently_playing_idx); -#ifdef FF_MIDI_RINGER +#ifdef FF_MIDI_RINGER #ifdef FF_MIDI_LOAD_FROM_MEM melody_data=sounds_midi_return_memory_location(mfw_player_currently_playing_idx); player_type=mfw_ringer_deduce_player_type(melody_data.melody_name); @@ -3856,8 +3856,8 @@ #else mfw_player_start_file(player_type,midi_file,(UBYTE)AS_VOLUME_HIGH,FALSE,sounds_midi_player_start_cb); #endif -#endif -#endif +#endif +#endif } else { @@ -3865,7 +3865,7 @@ //Reset the index to -1 to avoid playing only the last file. mfw_player_currently_playing_idx = -1; //flag set to 1 means we only play the currently selected file - mfw_player_exit_flag = PLAYER_EXIT_FLAG_TRUE; + mfw_player_exit_flag = PLAYER_EXIT_FLAG_TRUE; // Aug 05, 2005 xdeepadh #ifdef FF_MMI_AUDIO_PROFILE //configure the audio to voice path @@ -3884,9 +3884,9 @@ mfw_unset_stereo_path(mfw_get_current_audioDevice()); #endif } - + } -#endif//#ifdef FF_MMI_TEST_MIDI +#endif//#ifdef FF_MMI_TEST_MIDI } /******************************************************************************* @@ -3916,9 +3916,9 @@ /******************************************************************************* $Function: sounds_show_info - - $Description:Displays a dialog - + + $Description:Displays a dialog + $Returns: $Arguments: @@ -3953,7 +3953,7 @@ T_AS_RINGER_MODE current_mode = NULL; /* x0039928 - Lint warning fix */ TRACE_FUNCTION("get_ringer_mode"); - + switch(getSoundsReason()) { case MelodySelect: @@ -3995,18 +3995,18 @@ TRACE_EVENT_P1("playCurrentMelody. The selected tone is %d",selected_tone); /* DRT OMAPS00163752 including changes from OMAPS00151417 . Apr 09, 2008. x0086292 - Start */ - // stop running timer + // stop running timer if (hPlayerStartTimer != NULL ) { timStop(hPlayerStartTimer); } - + // wait for AS to stop playing file before starting to play new one if (mfwAudPlay == TRUE) { startPlayerTimer(); } - else + else { soundsPlayMidiPlayer(selected_tone); } @@ -4021,7 +4021,7 @@ $Function: soundsPlayMidiPlayer $Description: Play the tune selected by melody_id, stopping any currently - playing tunes if necessary. + playing tunes if necessary. $Returns: None $Arguments: melody_id, selects the melody to be played @@ -4041,7 +4041,7 @@ #ifdef FF_MMI_FILEMANAGER char temp[FILENAME_MAX_LEN]; UINT16 midi_file_uc[FILENAME_MAX_LEN]; -#endif +#endif #endif #endif @@ -4066,7 +4066,7 @@ #else mfw_player_start_file(player_type,midi_file,ringer_info->volume,FALSE,sounds_midi_player_start_cb); #endif -#endif +#endif } @@ -4111,9 +4111,9 @@ if ( hPlayerStartTimer != NULL ) timStop( hPlayerStartTimer ); // Stop the tone - + /* DRT OMAPS00163752 including changes from OMAPS00151417. Apr 09, 2008. x0086292 */ - if (mfwAudPlay == TRUE) + if (mfwAudPlay == TRUE) mfw_player_stop(sounds_midi_player_stop_cb); } @@ -4136,7 +4136,7 @@ TRACE_EVENT("playCurrentVolumeTone"); soundsPlayVolumeMelody(); - // stop running timer + // stop running timer if (hPlayerStartTimer != NULL ) { timStop(hPlayerStartTimer); @@ -4181,7 +4181,7 @@ timStop( hPlayerStartTimer ); // Are we playing a tune /* DRT OMAPS00163752 including changes from OMAPS00151417 . Apr 09, 2008. x0086292 */ - if (mfwAudPlay == TRUE) + if (mfwAudPlay == TRUE) mfw_player_stop(sounds_midi_player_stop_cb); } @@ -4190,7 +4190,7 @@ $Function: soundsPlayVolumeMelody $Description: Play the ringer tune with the selected volume, stopping any currently - playing tunes if necessary. + playing tunes if necessary. $Returns: None $Arguments: melody_id, selects the melody to be played @@ -4214,7 +4214,7 @@ mfw_player_start_memory(ringer_info->player_type,ringer_info->data.memory.address,ringer_info->data.memory.size,current.volumeSetting,FALSE,sounds_midi_player_start_cb); #else mfw_player_start_file(ringer_info->player_type,ringer_info->data.filename,(T_AS_VOLUME)current.volumeSetting,FALSE,sounds_midi_player_start_cb); -#endif +#endif #endif }