diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
| commit | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (patch) | |
| tree | 20ce1a2fd0cebc36231882b011e34230778a1db9 /plugins/dsp_libsrc/src.c | |
| parent | 527ba48d8209a8e854c791d571106a5daf2fdd29 (diff) | |
| parent | 708c8ba9f7aefe9f795c9c4eb30ab128f09c8b3d (diff) | |
Merge branch 'master' into devel
Conflicts:
README
configure.ac
deadbeef.h
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddblistview.c
plugins/gtkui/deadbeef.glade
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/shellexec/shellexec.c
plugins/supereq/Makefile.am
Diffstat (limited to 'plugins/dsp_libsrc/src.c')
| -rw-r--r-- | plugins/dsp_libsrc/src.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/dsp_libsrc/src.c b/plugins/dsp_libsrc/src.c index 8544343a..826606af 100644 --- a/plugins/dsp_libsrc/src.c +++ b/plugins/dsp_libsrc/src.c @@ -108,6 +108,9 @@ ddb_src_process (ddb_dsp_context_t *_src, float *samples, int nframes, int maxfr float samplerate = src->samplerate; if (src->autosamplerate) { DB_output_t *output = deadbeef->get_output (); + if (output->fmt.samplerate <= 0) { + return -1; + } samplerate = output->fmt.samplerate; } @@ -268,8 +271,8 @@ ddb_src_get_param (ddb_dsp_context_t *ctx, int p, char *val, int sz) { static const char settings_dlg[] = "property \"Automatic Samplerate (overrides Target Samplerate)\" checkbox 2 0;\n" - "property \"Target Samplerate\" spinbtn[8192,192000,1] 0 48000;\n" - "property \"Quality / Algorythm\" select[5] 1 2 SINC_BEST_QUALITY SINC_MEDIUM_QUALITY SINC_FASTEST ZERO_ORDER_HOLD LINEAR;\n" + "property \"Target Samplerate\" spinbtn[8000,192000,1] 0 48000;\n" + "property \"Quality / Algorithm\" select[5] 1 2 SINC_BEST_QUALITY SINC_MEDIUM_QUALITY SINC_FASTEST ZERO_ORDER_HOLD LINEAR;\n" ; static DB_dsp_t plugin = { |