diff options
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/playback.c b/apps/playback.c index b31db800ad..94a0430872 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -90,8 +90,6 @@ | |||
90 | 90 | ||
91 | /* default point to start buffer refill */ | 91 | /* default point to start buffer refill */ |
92 | #define AUDIO_DEFAULT_WATERMARK (1024*512) | 92 | #define AUDIO_DEFAULT_WATERMARK (1024*512) |
93 | /* amount of data to read in one read() call */ | ||
94 | #define AUDIO_DEFAULT_FILECHUNK (1024*32) | ||
95 | /* amount of guess-space to allow for codecs that must hunt and peck | 93 | /* amount of guess-space to allow for codecs that must hunt and peck |
96 | * for their correct seeek target, 32k seems a good size */ | 94 | * for their correct seeek target, 32k seems a good size */ |
97 | #define AUDIO_REBUFFER_GUESS_SIZE (1024*32) | 95 | #define AUDIO_REBUFFER_GUESS_SIZE (1024*32) |
@@ -1036,7 +1034,7 @@ static void set_filebuf_watermark(int seconds, size_t max) | |||
1036 | 1034 | ||
1037 | bytes = seconds?MAX(curtrack_id3.bitrate * seconds * (1000/8), max):max; | 1035 | bytes = seconds?MAX(curtrack_id3.bitrate * seconds * (1000/8), max):max; |
1038 | bytes = MIN(bytes, filebuflen / 2); | 1036 | bytes = MIN(bytes, filebuflen / 2); |
1039 | buf_set_conf(BUFFERING_SET_WATERMARK, bytes); | 1037 | buf_set_watermark(bytes); |
1040 | } | 1038 | } |
1041 | 1039 | ||
1042 | const char * get_codec_filename(int cod_spec) | 1040 | const char * get_codec_filename(int cod_spec) |
@@ -1659,10 +1657,6 @@ static void codec_configure_callback(int setting, intptr_t value) | |||
1659 | set_filebuf_watermark(buffer_margin, value); | 1657 | set_filebuf_watermark(buffer_margin, value); |
1660 | break; | 1658 | break; |
1661 | 1659 | ||
1662 | case CODEC_SET_FILEBUF_CHUNKSIZE: | ||
1663 | buf_set_conf(BUFFERING_SET_CHUNKSIZE, value); | ||
1664 | break; | ||
1665 | |||
1666 | default: | 1660 | default: |
1667 | if (!dsp_configure(setting, value)) { logf("Illegal key:%d", setting); } | 1661 | if (!dsp_configure(setting, value)) { logf("Illegal key:%d", setting); } |
1668 | } | 1662 | } |
@@ -2289,8 +2283,7 @@ static bool audio_load_track(int offset, bool start_play) | |||
2289 | int last_codec = current_codec; | 2283 | int last_codec = current_codec; |
2290 | 2284 | ||
2291 | set_current_codec(CODEC_IDX_AUDIO); | 2285 | set_current_codec(CODEC_IDX_AUDIO); |
2292 | buf_set_conf(BUFFERING_SET_WATERMARK, AUDIO_DEFAULT_WATERMARK); | 2286 | buf_set_watermark(AUDIO_DEFAULT_WATERMARK); |
2293 | buf_set_conf(BUFFERING_SET_CHUNKSIZE, AUDIO_DEFAULT_FILECHUNK); | ||
2294 | dsp_configure(DSP_RESET, 0); | 2287 | dsp_configure(DSP_RESET, 0); |
2295 | set_current_codec(last_codec); | 2288 | set_current_codec(last_codec); |
2296 | 2289 | ||