summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2009-07-03 21:48:16 +0200
committerGravatar waker <wakeroid@gmail.com>2009-07-03 21:48:16 +0200
commit5444dba34faa75c0a0219e292df25ccad51f2d4a (patch)
tree971a19cfd5c3291faab7b713910886690424f56c
parentea3c1d9b0351effebcae6925650a0d5060103901 (diff)
playlist now correctly ignores unknown file types
-rw-r--r--playlist.c3
-rw-r--r--psdl.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/playlist.c b/playlist.c
index 46480b44..33ef9996 100644
--- a/playlist.c
+++ b/playlist.c
@@ -34,6 +34,9 @@ ps_add_file (const char *fname) {
else if (!strcasecmp (eol, "mod")) {
it->codec = &cmod;
}
+ else {
+ return -1;
+ }
// copy string
it->fname = strdup (fname);
it->displayname = strdup (fname);
diff --git a/psdl.c b/psdl.c
index 0f905324..ef76b32b 100644
--- a/psdl.c
+++ b/psdl.c
@@ -3,7 +3,7 @@
#include "codec.h"
#include "playlist.h"
-static int sdl_player_numsamples;
+static int sdl_player_numsamples = 2<<16;
static int sdl_player_freq;
static float *sdl_buffer[2];
static SDL_AudioSpec spec;
@@ -27,7 +27,7 @@ psdl_init (void) {
spec.freq = freqs[frq];
spec.format = formats[fmt];
spec.channels = 2;
- spec.samples = freqs[fmt];
+ spec.samples = sdl_player_numsamples;
spec.callback = psdl_callback;
if (SDL_OpenAudio(&spec, &obt) < 0) {
fprintf(stderr, "SDL: couldn't open audio: %s\n", SDL_GetError());