diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/alpine_cdc.c | 4 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 4 | ||||
-rw-r--r-- | apps/plugins/test_disk.c | 2 | ||||
-rw-r--r-- | apps/plugins/wavplay.c | 4 | ||||
-rw-r--r-- | apps/plugins/wavrecord.c | 6 |
6 files changed, 12 insertions, 11 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 0c27a5b1de..a4ddbacfd0 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -120,7 +120,8 @@ nim.c | |||
120 | mp3_encoder.c | 120 | mp3_encoder.c |
121 | wav2wv.c | 121 | wav2wv.c |
122 | #else /* hardware codec platforms */ | 122 | #else /* hardware codec platforms */ |
123 | #ifndef HAVE_MMC /* not for Ondio, has no remote control pin */ | 123 | #if !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM) |
124 | /* not for Ondio, has no remote control pin */ | ||
124 | alpine_cdc.c | 125 | alpine_cdc.c |
125 | #endif | 126 | #endif |
126 | splitedit.c | 127 | splitedit.c |
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index f23255aea6..dfffc3b3cd 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "plugin.h" | 34 | #include "plugin.h" |
35 | 35 | ||
36 | /* Only build for (correct) target */ | 36 | /* Only build for (correct) target */ |
37 | #if CONFIG_CPU==SH7034 && !defined(HAVE_MMC) | 37 | #if CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) |
38 | 38 | ||
39 | PLUGIN_HEADER | 39 | PLUGIN_HEADER |
40 | 40 | ||
@@ -1199,4 +1199,4 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
1199 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; | 1199 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; |
1200 | } | 1200 | } |
1201 | 1201 | ||
1202 | #endif /* CONFIG_CPU==SH7034 && !defined(HAVE_MMC) */ | 1202 | #endif /* CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) */ |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index 8de6a746ab..dda46a0f29 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -1044,7 +1044,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1044 | case LOOP_MODE_TO: | 1044 | case LOOP_MODE_TO: |
1045 | rb->audio_pause(); | 1045 | rb->audio_pause(); |
1046 | rb->audio_ff_rewind(range_start); | 1046 | rb->audio_ff_rewind(range_start); |
1047 | #ifdef HAVE_MMC | 1047 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1048 | /* MMC is slow - wait some time to allow track reload to finish */ | 1048 | /* MMC is slow - wait some time to allow track reload to finish */ |
1049 | rb->sleep(HZ/20); | 1049 | rb->sleep(HZ/20); |
1050 | if (mp3->elapsed > play_end) /* reload in progress */ | 1050 | if (mp3->elapsed > play_end) /* reload in progress */ |
@@ -1056,7 +1056,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1056 | case LOOP_MODE_FROM: | 1056 | case LOOP_MODE_FROM: |
1057 | rb->audio_pause(); | 1057 | rb->audio_pause(); |
1058 | rb->audio_ff_rewind(xpos_to_time(split_x)); | 1058 | rb->audio_ff_rewind(xpos_to_time(split_x)); |
1059 | #ifdef HAVE_MMC | 1059 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1060 | /* MMC is slow - wait some time to allow track reload to finish */ | 1060 | /* MMC is slow - wait some time to allow track reload to finish */ |
1061 | rb->sleep(HZ/20); | 1061 | rb->sleep(HZ/20); |
1062 | if (mp3->elapsed > play_end) /* reload in progress */ | 1062 | if (mp3->elapsed > play_end) /* reload in progress */ |
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c index 7638fbf831..2e421e151e 100644 --- a/apps/plugins/test_disk.c +++ b/apps/plugins/test_disk.c | |||
@@ -29,7 +29,7 @@ PLUGIN_HEADER | |||
29 | #define TEST_FILE TESTBASEDIR "/test_disk.tmp" | 29 | #define TEST_FILE TESTBASEDIR "/test_disk.tmp" |
30 | #define FRND_SEED 0x78C3 /* arbirary */ | 30 | #define FRND_SEED 0x78C3 /* arbirary */ |
31 | 31 | ||
32 | #ifdef HAVE_MMC | 32 | #if (CONFIG_STORAGE & STORAGE_MMC) |
33 | #define TEST_SIZE (20*1024*1024) | 33 | #define TEST_SIZE (20*1024*1024) |
34 | #else | 34 | #else |
35 | #define TEST_SIZE (300*1024*1024) | 35 | #define TEST_SIZE (300*1024*1024) |
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 333d16135c..c37b656d1c 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
@@ -3574,7 +3574,7 @@ int play_file(char* filename) | |||
3574 | while (!(SSR0 & SCI_TEND)); /* wait for end of transfer */ | 3574 | while (!(SSR0 & SCI_TEND)); /* wait for end of transfer */ |
3575 | BRR0 = 0; /* maximum speed, ~3 MBit/s */ | 3575 | BRR0 = 0; /* maximum speed, ~3 MBit/s */ |
3576 | 3576 | ||
3577 | #ifndef HAVE_MMC | 3577 | #if !(CONFIG_STORAGE & STORAGE_MMC) |
3578 | low_water = 5 /* seconds */ | 3578 | low_water = 5 /* seconds */ |
3579 | * 2 /* bytes per sample */ | 3579 | * 2 /* bytes per sample */ |
3580 | * channels | 3580 | * channels |
@@ -3603,7 +3603,7 @@ int play_file(char* filename) | |||
3603 | else | 3603 | else |
3604 | { | 3604 | { |
3605 | wanted = MIN(free_space, aud_size - aud_write); | 3605 | wanted = MIN(free_space, aud_size - aud_write); |
3606 | #ifdef HAVE_MMC | 3606 | #if (CONFIG_STORAGE & STORAGE_MMC) |
3607 | wanted = MIN(wanted, 256*1024); | 3607 | wanted = MIN(wanted, 256*1024); |
3608 | #elif MEM == 8 | 3608 | #elif MEM == 8 |
3609 | wanted = MIN(wanted, 1024*1024); | 3609 | wanted = MIN(wanted, 1024*1024); |
diff --git a/apps/plugins/wavrecord.c b/apps/plugins/wavrecord.c index d57a61a6a2..d4b8bf1fd2 100644 --- a/apps/plugins/wavrecord.c +++ b/apps/plugins/wavrecord.c | |||
@@ -3587,7 +3587,7 @@ static int record_file(char *filename) | |||
3587 | if (to_save > aud_size) | 3587 | if (to_save > aud_size) |
3588 | { | 3588 | { |
3589 | rec_tick_enable(false); | 3589 | rec_tick_enable(false); |
3590 | #ifdef HAVE_MMC | 3590 | #if (CONFIG_STORAGE & STORAGE_MMC) |
3591 | rb->splash(HZ, "Data overrun (slow MMC)"); | 3591 | rb->splash(HZ, "Data overrun (slow MMC)"); |
3592 | #else | 3592 | #else |
3593 | rb->splash(HZ, "Data overrun"); | 3593 | rb->splash(HZ, "Data overrun"); |
@@ -3597,7 +3597,7 @@ static int record_file(char *filename) | |||
3597 | break; | 3597 | break; |
3598 | } | 3598 | } |
3599 | write_now = MIN(to_save, aud_size - aud_read); | 3599 | write_now = MIN(to_save, aud_size - aud_read); |
3600 | #ifdef HAVE_MMC | 3600 | #if (CONFIG_STORAGE & STORAGE_MMC) |
3601 | write_now = MIN(write_now, 256*1024); | 3601 | write_now = MIN(write_now, 256*1024); |
3602 | #else | 3602 | #else |
3603 | write_now = MIN(write_now, 1024*1024); | 3603 | write_now = MIN(write_now, 1024*1024); |
@@ -3802,7 +3802,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
3802 | return rc; | 3802 | return rc; |
3803 | 3803 | ||
3804 | #if 0 | 3804 | #if 0 |
3805 | #ifdef HAVE_MMC | 3805 | #if (CONFIG_STORAGE & STORAGE_MMC) |
3806 | return record_file("/<MMC1>/test.wav"); | 3806 | return record_file("/<MMC1>/test.wav"); |
3807 | #else | 3807 | #else |
3808 | return record_file("/test.wav"); | 3808 | return record_file("/test.wav"); |