diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-26 10:04:43 +0200 |
| commit | fe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch) | |
| tree | 34d97babbe5696f21779866fafad217b60c2bead /plugins/dumb | |
| parent | 4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff) | |
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/dumb')
| -rw-r--r-- | plugins/dumb/cdumb.c | 2 | ||||
| -rw-r--r-- | plugins/dumb/dumb-kode54/src/it/itrender.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c index 4410ba83..b8189eeb 100644 --- a/plugins/dumb/cdumb.c +++ b/plugins/dumb/cdumb.c @@ -77,7 +77,7 @@ cdumb_init (DB_fileinfo_t *_info, DB_playItem_t *it) { _info->plugin = &plugin; _info->bps = 16; _info->channels = 2; - _info->samplerate = deadbeef->conf_get_int ("synth.samplerate", 48000); + _info->samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100); _info->readpos = 0; if (cdumb_startrenderer (_info) < 0) { diff --git a/plugins/dumb/dumb-kode54/src/it/itrender.c b/plugins/dumb/dumb-kode54/src/it/itrender.c index d1ffc559..a5986928 100644 --- a/plugins/dumb/dumb-kode54/src/it/itrender.c +++ b/plugins/dumb/dumb-kode54/src/it/itrender.c @@ -3558,7 +3558,6 @@ static void process_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playin playing->sample_vibrato_time += playing->sample->vibrato_speed;
}
-//static float log2(float x) {return (float)log(x)/(float)log(2.0f);}
#ifndef __linux__
static inline float log2(float x) {return (float)log(x)/(float)log(2.0f);}
#endif
|