renamed mp3 functions to have prefix
This commit is contained in:
parent
69a295f84a
commit
61bb4b7fec
@ -2,8 +2,8 @@
|
||||
#ifndef _MP3_H_
|
||||
#define _MP3_H_
|
||||
|
||||
void start_mp3(char *fname, long long *samples, int *rate, int *channels);
|
||||
void stop_mp3(void);
|
||||
int update_mp3(char *buf, int bytes);
|
||||
void mp3_Start(char *fname, long long *samples, int *rate, int *channels);
|
||||
void mp3_Stop(void);
|
||||
int mp3_Update(char *buf, int bytes);
|
||||
|
||||
#endif // _MP3_H_
|
||||
|
@ -3391,7 +3391,7 @@ void loadFile(display_context_t disp)
|
||||
|
||||
audio_init(44100, 2);
|
||||
|
||||
start_mp3(name_file, &samples, &rate, &channels);
|
||||
mp3_Start(name_file, &samples, &rate, &channels);
|
||||
playing = 1;
|
||||
select_mode = 9;
|
||||
|
||||
@ -3557,7 +3557,7 @@ int main(void)
|
||||
sndUpdate();
|
||||
|
||||
if (playing == 1)
|
||||
playing = update_mp3(buf_ptr, buf_size);
|
||||
playing = mp3_Update(buf_ptr, buf_size);
|
||||
|
||||
if (input_mapping == file_manager)
|
||||
sleep(60);
|
||||
@ -4623,7 +4623,7 @@ int main(void)
|
||||
{
|
||||
//stop mp3
|
||||
|
||||
stop_mp3();
|
||||
mp3_Stop();
|
||||
playing = 0;
|
||||
|
||||
clearScreen(disp); //part clear?
|
||||
|
@ -359,7 +359,7 @@ static void MP3_GetInfo(long long *samples, int *rate) {
|
||||
}
|
||||
|
||||
|
||||
void start_mp3(char *fname, long long *samples, int *rate, int *channels) {
|
||||
void mp3_Start(char *fname, long long *samples, int *rate, int *channels) {
|
||||
sprintf(mp3Fd, "%s", fname);
|
||||
|
||||
//if (mp3Fd[0]!=0)
|
||||
@ -378,7 +378,7 @@ void start_mp3(char *fname, long long *samples, int *rate, int *channels) {
|
||||
//*samples = 0;
|
||||
}
|
||||
|
||||
void stop_mp3(void) {
|
||||
void mp3_Stop(void) {
|
||||
MP3_Exit();
|
||||
mp3File_fptr=0;
|
||||
/*
|
||||
@ -393,7 +393,7 @@ void stop_mp3(void) {
|
||||
*/
|
||||
}
|
||||
|
||||
int update_mp3(char *buf, int bytes) {
|
||||
int mp3_Update(char *buf, int bytes) {
|
||||
MP3_Callback(buf, bytes/4);
|
||||
return eos ? 0 : 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user