diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/alpine_cdc.c | 58 | ||||
-rw-r--r-- | apps/plugins/favorites.c | 2 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 44 |
3 files changed, 52 insertions, 52 deletions
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index d944810b31..d0b3b1d8d1 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -817,7 +817,7 @@ void emu_process_packet(unsigned char* mbus_msg, int msg_size) | |||
817 | 817 | ||
818 | if (playmsg_dirty) | 818 | if (playmsg_dirty) |
819 | { | 819 | { |
820 | rb->yield(); /* give the mpeg thread a chance to process */ | 820 | rb->yield(); /* give the audio thread a chance to process */ |
821 | get_playmsg(); /* force update */ | 821 | get_playmsg(); /* force update */ |
822 | mbus_send(gEmu.playmsg, sizeof(gEmu.playmsg)); | 822 | mbus_send(gEmu.playmsg, sizeof(gEmu.playmsg)); |
823 | } | 823 | } |
@@ -876,10 +876,10 @@ void get_playmsg(void) | |||
876 | 876 | ||
877 | if (gEmu.set_state != EMU_FF && gEmu.set_state != EMU_FR) | 877 | if (gEmu.set_state != EMU_FF && gEmu.set_state != EMU_FR) |
878 | { | 878 | { |
879 | switch(rb->mpeg_status()) | 879 | switch(rb->audio_status()) |
880 | { | 880 | { |
881 | case MPEG_STATUS_PLAY: | 881 | case AUDIO_STATUS_PLAY: |
882 | print_scroll("MpegStat Play"); | 882 | print_scroll("AudioStat Play"); |
883 | if (gEmu.set_state == EMU_FF || gEmu.set_state == EMU_FR) | 883 | if (gEmu.set_state == EMU_FF || gEmu.set_state == EMU_FR) |
884 | gEmu.playmsg[2] = gEmu.set_state; /* set FF/FR */ | 884 | gEmu.playmsg[2] = gEmu.set_state; /* set FF/FR */ |
885 | else | 885 | else |
@@ -890,8 +890,8 @@ void get_playmsg(void) | |||
890 | bit_set(gEmu.playmsg, 59, false); /* clear stop */ | 890 | bit_set(gEmu.playmsg, 59, false); /* clear stop */ |
891 | break; | 891 | break; |
892 | 892 | ||
893 | case MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE: | 893 | case AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE: |
894 | print_scroll("MpegStat Pause"); | 894 | print_scroll("AudioStat Pause"); |
895 | gEmu.playmsg[2] = EMU_PAUSED; | 895 | gEmu.playmsg[2] = EMU_PAUSED; |
896 | bit_set(gEmu.playmsg, 56, false); /* clear play */ | 896 | bit_set(gEmu.playmsg, 56, false); /* clear play */ |
897 | bit_set(gEmu.playmsg, 57, true); /* set pause */ | 897 | bit_set(gEmu.playmsg, 57, true); /* set pause */ |
@@ -899,7 +899,7 @@ void get_playmsg(void) | |||
899 | break; | 899 | break; |
900 | 900 | ||
901 | default: | 901 | default: |
902 | print_scroll("MpegStat 0"); | 902 | print_scroll("AudioStat 0"); |
903 | gEmu.playmsg[2] = EMU_STOPPED; | 903 | gEmu.playmsg[2] = EMU_STOPPED; |
904 | bit_set(gEmu.playmsg, 56, false); /* clear play */ | 904 | bit_set(gEmu.playmsg, 56, false); /* clear play */ |
905 | bit_set(gEmu.playmsg, 57, false); /* clear pause */ | 905 | bit_set(gEmu.playmsg, 57, false); /* clear pause */ |
@@ -943,7 +943,7 @@ int get_playtime(void) | |||
943 | { | 943 | { |
944 | struct mp3entry* p_mp3entry; | 944 | struct mp3entry* p_mp3entry; |
945 | 945 | ||
946 | p_mp3entry = rb->mpeg_current_track(); | 946 | p_mp3entry = rb->audio_current_track(); |
947 | if (p_mp3entry == NULL) | 947 | if (p_mp3entry == NULL) |
948 | return 0; | 948 | return 0; |
949 | 949 | ||
@@ -955,7 +955,7 @@ int get_tracklength(void) | |||
955 | { | 955 | { |
956 | struct mp3entry* p_mp3entry; | 956 | struct mp3entry* p_mp3entry; |
957 | 957 | ||
958 | p_mp3entry = rb->mpeg_current_track(); | 958 | p_mp3entry = rb->audio_current_track(); |
959 | if (p_mp3entry == NULL) | 959 | if (p_mp3entry == NULL) |
960 | return 0; | 960 | return 0; |
961 | 961 | ||
@@ -967,13 +967,13 @@ void set_track(int selected) | |||
967 | { | 967 | { |
968 | if (selected > get_track()) | 968 | if (selected > get_track()) |
969 | { | 969 | { |
970 | print_scroll("mpeg_next"); | 970 | print_scroll("audio_next"); |
971 | rb->mpeg_next(); | 971 | rb->audio_next(); |
972 | } | 972 | } |
973 | else if (selected < get_track()) | 973 | else if (selected < get_track()) |
974 | { | 974 | { |
975 | print_scroll("mpeg_prev"); | 975 | print_scroll("audio_prev"); |
976 | rb->mpeg_prev(); | 976 | rb->audio_prev(); |
977 | } | 977 | } |
978 | } | 978 | } |
979 | 979 | ||
@@ -982,7 +982,7 @@ int get_track(void) | |||
982 | { | 982 | { |
983 | struct mp3entry* p_mp3entry; | 983 | struct mp3entry* p_mp3entry; |
984 | 984 | ||
985 | p_mp3entry = rb->mpeg_current_track(); | 985 | p_mp3entry = rb->audio_current_track(); |
986 | if (p_mp3entry == NULL) | 986 | if (p_mp3entry == NULL) |
987 | return 0; | 987 | return 0; |
988 | 988 | ||
@@ -992,48 +992,48 @@ int get_track(void) | |||
992 | /* start or resume playback */ | 992 | /* start or resume playback */ |
993 | void set_play(void) | 993 | void set_play(void) |
994 | { | 994 | { |
995 | if (rb->mpeg_status() == MPEG_STATUS_PLAY) | 995 | if (rb->audio_status() == AUDIO_STATUS_PLAY) |
996 | return; | 996 | return; |
997 | 997 | ||
998 | if (rb->mpeg_status() == (MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE)) | 998 | if (rb->audio_status() == (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE)) |
999 | { | 999 | { |
1000 | print_scroll("mpeg_resume"); | 1000 | print_scroll("audio_resume"); |
1001 | rb->mpeg_resume(); | 1001 | rb->audio_resume(); |
1002 | } | 1002 | } |
1003 | else | 1003 | else |
1004 | { | 1004 | { |
1005 | print_scroll("mpeg_play(0)"); | 1005 | print_scroll("audio_play(0)"); |
1006 | rb->mpeg_play(0); | 1006 | rb->audio_play(0); |
1007 | } | 1007 | } |
1008 | } | 1008 | } |
1009 | 1009 | ||
1010 | /* pause playback */ | 1010 | /* pause playback */ |
1011 | void set_pause(void) | 1011 | void set_pause(void) |
1012 | { | 1012 | { |
1013 | if (rb->mpeg_status() == MPEG_STATUS_PLAY) | 1013 | if (rb->audio_status() == AUDIO_STATUS_PLAY) |
1014 | { | 1014 | { |
1015 | print_scroll("mpeg_pause"); | 1015 | print_scroll("audio_pause"); |
1016 | rb->mpeg_pause(); | 1016 | rb->audio_pause(); |
1017 | } | 1017 | } |
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | /* stop playback */ | 1020 | /* stop playback */ |
1021 | void set_stop(void) | 1021 | void set_stop(void) |
1022 | { | 1022 | { |
1023 | if (rb->mpeg_status() & MPEG_STATUS_PLAY) | 1023 | if (rb->audio_status() & AUDIO_STATUS_PLAY) |
1024 | { | 1024 | { |
1025 | print_scroll("mpeg_stop"); | 1025 | print_scroll("audio_stop"); |
1026 | rb->mpeg_stop(); | 1026 | rb->audio_stop(); |
1027 | } | 1027 | } |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | /* seek */ | 1030 | /* seek */ |
1031 | void set_position(int seconds) | 1031 | void set_position(int seconds) |
1032 | { | 1032 | { |
1033 | if (rb->mpeg_status() & MPEG_STATUS_PLAY) | 1033 | if (rb->audio_status() & AUDIO_STATUS_PLAY) |
1034 | { | 1034 | { |
1035 | print_scroll("mpeg_ff_rewind"); | 1035 | print_scroll("audio_ff_rewind"); |
1036 | rb->mpeg_ff_rewind(seconds * 1000); | 1036 | rb->audio_ff_rewind(seconds * 1000); |
1037 | } | 1037 | } |
1038 | } | 1038 | } |
1039 | 1039 | ||
diff --git a/apps/plugins/favorites.c b/apps/plugins/favorites.c index c4b969f920..68eab43298 100644 --- a/apps/plugins/favorites.c +++ b/apps/plugins/favorites.c | |||
@@ -21,7 +21,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
21 | if(parameter) { | 21 | if(parameter) { |
22 | rb->strncpy(track_path, parameter, MAX_PATH); | 22 | rb->strncpy(track_path, parameter, MAX_PATH); |
23 | } else { | 23 | } else { |
24 | id3 = rb->mpeg_current_track(); | 24 | id3 = rb->audio_current_track(); |
25 | if (!id3) { | 25 | if (!id3) { |
26 | rb->splash(HZ*2, true, "Nothing To Save"); | 26 | rb->splash(HZ*2, true, "Nothing To Save"); |
27 | return PLUGIN_OK; | 27 | return PLUGIN_OK; |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index c2cdc8de6e..d38223827b 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -614,11 +614,11 @@ static int save( | |||
614 | } | 614 | } |
615 | 615 | ||
616 | /* find the file position of the split point */ | 616 | /* find the file position of the split point */ |
617 | rb->mpeg_pause(); | 617 | rb->audio_pause(); |
618 | rb->mpeg_ff_rewind(splittime); | 618 | rb->audio_ff_rewind(splittime); |
619 | rb->yield(); | 619 | rb->yield(); |
620 | rb->yield(); | 620 | rb->yield(); |
621 | end = rb->mpeg_get_file_pos(); | 621 | end = rb->audio_get_file_pos(); |
622 | 622 | ||
623 | /* open the source file */ | 623 | /* open the source file */ |
624 | src_file = rb->open(mp3->path, O_RDONLY); | 624 | src_file = rb->open(mp3->path, O_RDONLY); |
@@ -720,7 +720,7 @@ static int save( | |||
720 | retval = -3; | 720 | retval = -3; |
721 | } | 721 | } |
722 | 722 | ||
723 | rb->mpeg_resume(); | 723 | rb->audio_resume(); |
724 | 724 | ||
725 | return retval; | 725 | return retval; |
726 | } | 726 | } |
@@ -985,27 +985,27 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
985 | 985 | ||
986 | case LOOP_MODE_ALL: | 986 | case LOOP_MODE_ALL: |
987 | case LOOP_MODE_TO: | 987 | case LOOP_MODE_TO: |
988 | rb->mpeg_pause(); | 988 | rb->audio_pause(); |
989 | rb->mpeg_ff_rewind(range_start); | 989 | rb->audio_ff_rewind(range_start); |
990 | #ifdef HAVE_MMC | 990 | #ifdef HAVE_MMC |
991 | /* MMC is slow - wait some time to allow track reload to finish */ | 991 | /* MMC is slow - wait some time to allow track reload to finish */ |
992 | rb->sleep(HZ/20); | 992 | rb->sleep(HZ/20); |
993 | if (mp3->elapsed > play_end) /* reload in progress */ | 993 | if (mp3->elapsed > play_end) /* reload in progress */ |
994 | rb->splash(10*HZ, true, "Wait - reloading"); | 994 | rb->splash(10*HZ, true, "Wait - reloading"); |
995 | #endif | 995 | #endif |
996 | rb->mpeg_resume(); | 996 | rb->audio_resume(); |
997 | break; | 997 | break; |
998 | 998 | ||
999 | case LOOP_MODE_FROM: | 999 | case LOOP_MODE_FROM: |
1000 | rb->mpeg_pause(); | 1000 | rb->audio_pause(); |
1001 | rb->mpeg_ff_rewind(xpos_to_time(split_x)); | 1001 | rb->audio_ff_rewind(xpos_to_time(split_x)); |
1002 | #ifdef HAVE_MMC | 1002 | #ifdef HAVE_MMC |
1003 | /* MMC is slow - wait some time to allow track reload to finish */ | 1003 | /* MMC is slow - wait some time to allow track reload to finish */ |
1004 | rb->sleep(HZ/20); | 1004 | rb->sleep(HZ/20); |
1005 | if (mp3->elapsed > play_end) /* reload in progress */ | 1005 | if (mp3->elapsed > play_end) /* reload in progress */ |
1006 | rb->splash(10*HZ, true, "Wait - reloading"); | 1006 | rb->splash(10*HZ, true, "Wait - reloading"); |
1007 | #endif | 1007 | #endif |
1008 | rb->mpeg_resume(); | 1008 | rb->audio_resume(); |
1009 | break; | 1009 | break; |
1010 | 1010 | ||
1011 | case LOOP_MODE_FREE: | 1011 | case LOOP_MODE_FREE: |
@@ -1037,9 +1037,9 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1037 | if (lastbutton != SPLITEDIT_PLAY_PRE) | 1037 | if (lastbutton != SPLITEDIT_PLAY_PRE) |
1038 | break; | 1038 | break; |
1039 | #endif | 1039 | #endif |
1040 | rb->mpeg_pause(); | 1040 | rb->audio_pause(); |
1041 | rb->mpeg_ff_rewind(xpos_to_time(split_x)); | 1041 | rb->audio_ff_rewind(xpos_to_time(split_x)); |
1042 | rb->mpeg_resume(); | 1042 | rb->audio_resume(); |
1043 | break; | 1043 | break; |
1044 | 1044 | ||
1045 | case BUTTON_UP: | 1045 | case BUTTON_UP: |
@@ -1159,9 +1159,9 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1159 | } | 1159 | } |
1160 | update_data(); | 1160 | update_data(); |
1161 | 1161 | ||
1162 | if (mp3 != rb->mpeg_current_track()) | 1162 | if (mp3 != rb->audio_current_track()) |
1163 | { | 1163 | { |
1164 | struct mp3entry *new_mp3 = rb->mpeg_current_track(); | 1164 | struct mp3entry *new_mp3 = rb->audio_current_track(); |
1165 | if (rb->strncasecmp(path_mp3, new_mp3->path, | 1165 | if (rb->strncasecmp(path_mp3, new_mp3->path, |
1166 | sizeof (path_mp3))) | 1166 | sizeof (path_mp3))) |
1167 | { | 1167 | { |
@@ -1173,10 +1173,10 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1173 | else | 1173 | else |
1174 | { | 1174 | { |
1175 | mp3 = new_mp3; | 1175 | mp3 = new_mp3; |
1176 | rb->mpeg_pause(); | 1176 | rb->audio_pause(); |
1177 | rb->mpeg_flush_and_reload_tracks(); | 1177 | rb->audio_flush_and_reload_tracks(); |
1178 | rb->mpeg_ff_rewind(range_start); | 1178 | rb->audio_ff_rewind(range_start); |
1179 | rb->mpeg_resume(); | 1179 | rb->audio_resume(); |
1180 | } | 1180 | } |
1181 | } | 1181 | } |
1182 | } | 1182 | } |
@@ -1192,12 +1192,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1192 | rb = api; | 1192 | rb = api; |
1193 | rb->lcd_clear_display(); | 1193 | rb->lcd_clear_display(); |
1194 | rb->lcd_update(); | 1194 | rb->lcd_update(); |
1195 | mp3 = rb->mpeg_current_track(); | 1195 | mp3 = rb->audio_current_track(); |
1196 | if (mp3 != NULL) | 1196 | if (mp3 != NULL) |
1197 | { | 1197 | { |
1198 | if (rb->mpeg_status() & MPEG_STATUS_PAUSE) | 1198 | if (rb->audio_status() & AUDIO_STATUS_PAUSE) |
1199 | { | 1199 | { |
1200 | rb->mpeg_resume(); | 1200 | rb->audio_resume(); |
1201 | } | 1201 | } |
1202 | splitedit_editor(mp3, mp3->elapsed, MIN_RANGE_SIZE * 8); | 1202 | splitedit_editor(mp3, mp3->elapsed, MIN_RANGE_SIZE * 8); |
1203 | } | 1203 | } |