summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cdumb.c24
-rw-r--r--cflac.c6
-rw-r--r--cgme.c4
-rw-r--r--cmp3.c10
-rw-r--r--csid.cpp2
-rw-r--r--streamer.c2
6 files changed, 24 insertions, 24 deletions
diff --git a/cdumb.c b/cdumb.c
index 644066ea..5494480c 100644
--- a/cdumb.c
+++ b/cdumb.c
@@ -278,19 +278,19 @@ static DUH * open_module(const char *fname, const char *ext, int *start_order, i
{
*is_it = 1;
duh = dumb_read_it_quick(f);
- *filetype = "it";
+ *filetype = "IT";
}
else if (size >= 17 && !memcmp(ptr, "Extended Module: ", 17))
{
duh = dumb_read_xm_quick(f);
- *filetype = "xm";
+ *filetype = "XM";
}
else if (size >= 0x30 &&
ptr[0x2C] == 'S' && ptr[0x2D] == 'C' &&
ptr[0x2E] == 'R' && ptr[0x2F] == 'M')
{
duh = dumb_read_s3m_quick(f);
- *filetype = "s3m";
+ *filetype = "S3M";
}
else if (size >= 1168 &&
/*ptr[28] == 0x1A &&*/ ptr[29] == 2 &&
@@ -299,7 +299,7 @@ static DUH * open_module(const char *fname, const char *ext, int *start_order, i
! strncasecmp( ( const char * ) ptr + 20, "WUZAMOD!", 8 ) ) )
{
duh = dumb_read_stm_quick(f);
- *filetype = "stm";
+ *filetype = "STM";
}
else if (size >= 2 &&
((ptr[0] == 0x69 && ptr[1] == 0x66) ||
@@ -313,7 +313,7 @@ static DUH * open_module(const char *fname, const char *ext, int *start_order, i
ptr[0x2E] == 'M' && ptr[0x2F] == 'F')
{
duh = dumb_read_ptm_quick(f);
- *filetype = "ptm";
+ *filetype = "PTM";
}
else if (size >= 4 &&
ptr[0] == 'P' && ptr[1] == 'S' &&
@@ -321,35 +321,35 @@ static DUH * open_module(const char *fname, const char *ext, int *start_order, i
{
duh = dumb_read_psm_quick(f, *start_order);
*start_order = 0;
- *filetype = "psm";
+ *filetype = "PSM";
}
else if (size >= 4 &&
ptr[0] == 'P' && ptr[1] == 'S' &&
ptr[2] == 'M' && ptr[3] == 254)
{
duh = dumb_read_old_psm_quick(f);
- *filetype = "psm";
+ *filetype = "PSM";
}
else if (size >= 3 &&
ptr[0] == 'M' && ptr[1] == 'T' &&
ptr[2] == 'M')
{
duh = dumb_read_mtm_quick(f);
- *filetype = "mtm";
+ *filetype = "MTM";
}
else if ( size >= 4 &&
ptr[0] == 'R' && ptr[1] == 'I' &&
ptr[2] == 'F' && ptr[3] == 'F')
{
duh = dumb_read_riff_quick(f);
- *filetype = "riff";
+ *filetype = "RIFF";
}
else if ( size >= 32 &&
!memcmp( ptr, "ASYLUM Music Format", 19 ) &&
!memcmp( ptr + 19, " V1.0", 5 ) )
{
duh = dumb_read_asy_quick(f);
- *filetype = "asy";
+ *filetype = "ASY";
}
if (!duh)
@@ -358,7 +358,7 @@ static DUH * open_module(const char *fname, const char *ext, int *start_order, i
f = dumbfile_open (fname);
*is_dos = 0;
duh = dumb_read_mod_quick (f, (!strcasecmp (ext, exts[0]) || !strcasecmp (ext, exts[1])) ? 0 : 1);
- *filetype = "mod";
+ *filetype = "MOD";
}
if (f) {
@@ -801,6 +801,6 @@ codec_t cdumb = {
.insert = cdumb_insert,
.getexts = cdumb_getexts,
.id = "stddumb",
- .filetypes = { "it", "xm", "s3m", "stm", "669", "ptm", "psm", "mtm", "riff", "asy", "mod", NULL }
+ .filetypes = { "IT", "XM", "S3M", "STM", "669", "PTM", "PSM", "MTM", "RIFF", "ASY", "MOD", NULL }
};
diff --git a/cflac.c b/cflac.c
index 615b7527..f8483486 100644
--- a/cflac.c
+++ b/cflac.c
@@ -405,14 +405,14 @@ cflac_insert (playItem_t *after, const char *fname) {
}
#endif
FLAC__stream_decoder_delete(decoder);
- it->filetype = "flac";
+ it->filetype = "FLAC";
after = pl_insert_item (after, it);
return after;
}
static const char * exts[]=
{
- "flac","ogg",NULL
+ "flac",NULL
};
const char **cflac_getexts (void) {
@@ -427,5 +427,5 @@ codec_t cflac = {
.insert = cflac_insert,
.getexts = cflac_getexts,
.id = "stdflac",
- .filetypes = { "flac", NULL }
+ .filetypes = { "FLAC", NULL }
};
diff --git a/cgme.c b/cgme.c
index 87ac84e5..b6dd227b 100644
--- a/cgme.c
+++ b/cgme.c
@@ -140,7 +140,7 @@ cgme_insert (playItem_t *after, const char *fname) {
else {
it->duration = (float)inf.length/1000.f;
}
- it->filetype = "gme";
+ it->filetype = "GameMusic";
after = pl_insert_item (after, it);
}
else {
@@ -193,6 +193,6 @@ codec_t cgme = {
.numvoices = cgme_numvoices,
.mutevoice = cgme_mutevoice,
.id = "stdgme",
- .filetypes = { "gme", NULL }
+ .filetypes = { "GameMusic", NULL }
};
diff --git a/cmp3.c b/cmp3.c
index a2c88b87..f741be11 100644
--- a/cmp3.c
+++ b/cmp3.c
@@ -1622,17 +1622,17 @@ cmp3_insert (playItem_t *after, const char *fname) {
it->duration = buffer.duration;
switch (buffer.layer) {
case 1:
- it->filetype = "mp1";
+ it->filetype = "MP1";
break;
case 2:
- it->filetype = "mp2";
+ it->filetype = "MP2";
break;
case 3:
- it->filetype = "mp3";
+ it->filetype = "MP3";
break;
}
- playItem_t *cue_after = pl_insert_cue (after, fname, &cmp3, "mp3");
+ playItem_t *cue_after = pl_insert_cue (after, fname, &cmp3, it->filetype);
if (cue_after) {
cue_after->timeend = buffer.duration;
cue_after->duration = cue_after->timeend - cue_after->timestart;
@@ -1663,7 +1663,7 @@ codec_t cmp3 = {
.insert = cmp3_insert,
.getexts = cmp3_getexts,
.id = "stdmp3",
- .filetypes = { "mp1", "mp2", "mp3", NULL }
+ .filetypes = { "MP1", "MP2", "MP3", NULL }
};
diff --git a/csid.cpp b/csid.cpp
index 0df172b4..d50dbbd9 100644
--- a/csid.cpp
+++ b/csid.cpp
@@ -505,6 +505,6 @@ codec_t csid = {
csid_numvoices,
csid_mutevoice,
"stdsid",
- { "sid", NULL }
+ { "SID", NULL }
};
diff --git a/streamer.c b/streamer.c
index 9aa4d68d..7b6216e9 100644
--- a/streamer.c
+++ b/streamer.c
@@ -353,7 +353,7 @@ streamer_ok_to_read (int len) {
if (bytes_until_next_song > 0) {
return 1;
}
- return streambuffer_fill >= len;
+ return streambuffer_fill >= (len*2);
}
int
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 07:53:27 +0000