summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--callbacks.c4
-rw-r--r--cflac.c79
-rw-r--r--cgme.c16
-rw-r--r--codec.h1
-rw-r--r--playlist.c1
5 files changed, 56 insertions, 45 deletions
diff --git a/callbacks.c b/callbacks.c
index 4d86b537..6fde02a4 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -49,10 +49,10 @@ on_playpos_value_changed (GtkRange *range,
return;
}
if (playlist_current.codec) {
- if (playlist_current.codec->info.duration > 0) {
+ if (playlist_current.duration > 0) {
int val = gtk_range_get_value (range);
int upper = gtk_adjustment_get_upper (gtk_range_get_adjustment (range));
- float time = playlist_current.codec->info.duration / (float)upper * (float)val;
+ float time = playlist_current.duration / (float)upper * (float)val;
messagepump_push (M_SONGSEEK, 0, (int)time * 1000, 0);
}
}
diff --git a/cflac.c b/cflac.c
index ecbfacf3..717bf5c5 100644
--- a/cflac.c
+++ b/cflac.c
@@ -52,7 +52,6 @@ cflac_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMe
cflac.info.samplesPerSecond = sample_rate;
cflac.info.channels = channels;
cflac.info.bitsPerSample = bps;
- cflac.info.duration = total_samples / (float)sample_rate;
cflac.info.position = 0;
}
@@ -91,20 +90,20 @@ cflac_init (const char *fname, int track, float start, float end) {
timeend = end;
if (timeend > timestart || timeend < 0) {
// take from cue and seek
- if (timeend < 0) {
- // must be last (or broken) track
- timeend = cflac.info.duration; // set from metainfo
- }
- cflac.info.duration = timeend - timestart;
+// if (timeend < 0) {
+// // must be last (or broken) track
+// timeend = playlist_current.duration; // set from metainfo
+// }
+// cflac.info.duration = timeend - timestart;
cflac.seek (0);
}
- if (cflac.info.duration == -1) {
- printf ("FLAC duration calculation failed\n");
- return -1;
- }
- else {
- //printf ("%s duration %f, start %f (%f), end %f (%f)\n", fname, cflac.info.duration, timestart, start, timeend, end);
- }
+// if (cflac.info.duration == -1) {
+// printf ("FLAC duration calculation failed\n");
+// return -1;
+// }
+// else {
+// //printf ("%s duration %f, start %f (%f), end %f (%f)\n", fname, cflac.info.duration, timestart, start, timeend, end);
+// }
remaining = 0;
return 0;
@@ -181,6 +180,7 @@ typedef struct {
const char *fname;
int samplerate;
int nchannels;
+ float duration;
} cue_cb_data_t;
void
@@ -189,6 +189,7 @@ cflac_init_cue_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC_
if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
cb->samplerate = metadata->data.stream_info.sample_rate;
cb->nchannels = metadata->data.stream_info.channels;
+ cb->duration = metadata->data.stream_info.total_samples / (float)metadata->data.stream_info.sample_rate;
}
else if (metadata->type == FLAC__METADATA_TYPE_CUESHEET) {
//printf ("loading embedded cuesheet!\n");
@@ -204,9 +205,10 @@ cflac_init_cue_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC_
it->fname = strdup (cb->fname);
it->tracknum = t->number;
it->timestart = (float)t->offset / cb->samplerate;
- it->timeend = -1; // will be filled by next read, or by codec
+ it->timeend = -1; // will be filled by next read
if (prev) {
prev->timeend = it->timestart;
+ prev->duration = prev->timeend - prev->timestart;
}
//printf ("N: %d, t: %f, bps=%d\n", it->tracknum, it->timestart/60.f, cb->samplerate);
playItem_t *ins = ps_insert_item (cb->last, it);
@@ -220,6 +222,10 @@ cflac_init_cue_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC_
prev = it;
}
}
+ if (prev) {
+ prev->timeend = cb->duration;
+ prev->duration = prev->timeend - prev->timestart;
+ }
}
else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
playItem_t *it = NULL;
@@ -243,7 +249,10 @@ void
cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) {
playItem_t *it = (playItem_t *)client_data;
//it->tracknum = 0;
- if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
+ if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ it->duration = metadata->data.stream_info.total_samples / (float)metadata->data.stream_info.sample_rate;
+ }
+ else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
int title_added = 0;
for (int i = 0; i < vc->num_comments; i++) {
@@ -285,24 +294,7 @@ cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__Str
playItem_t *
cflac_insert (playItem_t *after, const char *fname) {
- // try cue
- char cuename[1024];
- snprintf (cuename, 1024, "%s.cue", fname);
-// printf ("loading %s\n", cuename);
- playItem_t *cue_after;
- if ((cue_after = ps_insert_cue (after, cuename)) != NULL) {
- return cue_after;
- }
- int n = strlen (fname) - 4;
- if (n > 0) {
- strncpy (cuename, fname, n);
- strcpy (cuename + n, "cue");
- // printf ("loading %s\n", cuename);
- if ((cue_after = ps_insert_cue (after, cuename)) != NULL) {
- return cue_after;
- }
- }
-
+ //try embedded cue, and calculate duration
FLAC__StreamDecoder *decoder = 0;
FLAC__StreamDecoderInitStatus status;
decoder = FLAC__stream_decoder_new();
@@ -338,6 +330,25 @@ cflac_insert (playItem_t *after, const char *fname) {
return cb.last;
}
+ // try external cue
+ char cuename[1024];
+ snprintf (cuename, 1024, "%s.cue", fname);
+ playItem_t *cue_after;
+ if ((cue_after = ps_insert_cue (after, cuename)) != NULL) {
+ cue_after->timeend = cb.duration;
+ cue_after->duration = cue_after->timeend - cue_after->timestart;
+ return cue_after;
+ }
+ int n = strlen (fname) - 4;
+ if (n > 0) {
+ strncpy (cuename, fname, n);
+ strcpy (cuename + n, "cue");
+ // printf ("loading %s\n", cuename);
+ if ((cue_after = ps_insert_cue (after, cuename)) != NULL) {
+ return cue_after;
+ }
+ }
+
//printf ("adding flac without cue\n");
decoder = FLAC__stream_decoder_new();
if (!decoder) {
@@ -346,7 +357,7 @@ cflac_insert (playItem_t *after, const char *fname) {
}
FLAC__stream_decoder_set_md5_checking(decoder, 0);
// try single FLAC file without cue
- FLAC__stream_decoder_set_metadata_respond (decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ FLAC__stream_decoder_set_metadata_respond_all (decoder);
int samplerate = -1;
playItem_t *it = malloc (sizeof (playItem_t));
memset (it, 0, sizeof (playItem_t));
diff --git a/cgme.c b/cgme.c
index a1147a49..046f0f3e 100644
--- a/cgme.c
+++ b/cgme.c
@@ -26,12 +26,6 @@ cgme_init (const char *fname, int track, float start, float end) {
cgme.info.samplesPerSecond = p_get_rate ();
reallength = inf.length;
nzerosamples = 0;
- if (inf.length == -1) {
- cgme.info.duration = 300;
- }
- else {
- cgme.info.duration = (float)inf.length/1000.f;
- }
cgme.info.position = 0;
return 0;
}
@@ -47,8 +41,8 @@ cgme_free (void) {
int
cgme_read (char *bytes, int size) {
float t = (size/4) / (float)cgme.info.samplesPerSecond;
- if (cgme.info.position + t >= cgme.info.duration) {
- t = cgme.info.duration - cgme.info.position;
+ if (cgme.info.position + t >= playlist_current.duration) {
+ t = playlist_current.duration - cgme.info.position;
if (t <= 0) {
return 0;
}
@@ -123,6 +117,12 @@ cgme_insert (playItem_t *after, const char *fname) {
char trk[10];
snprintf (trk, 10, "%d", i+1);
ps_add_meta (it, "track", trk);
+ if (inf.length == -1) {
+ it->duration = 300;
+ }
+ else {
+ it->duration = (float)inf.length/1000.f;
+ }
after = ps_insert_item (after, it);
}
else {
diff --git a/codec.h b/codec.h
index 68f29e54..7d0eba3a 100644
--- a/codec.h
+++ b/codec.h
@@ -8,7 +8,6 @@ typedef struct {
int bitsPerSample;
int channels;
int samplesPerSecond;
- float duration;
float position;
} fileinfo_t;
diff --git a/playlist.c b/playlist.c
index 70e173d6..f7c9cf1b 100644
--- a/playlist.c
+++ b/playlist.c
@@ -199,6 +199,7 @@ ps_insert_cue (playItem_t *after, const char *cuename) {
}
if (prev) {
prev->timeend = tstart;
+ prev->duration = prev->timeend - prev->timestart;
// printf ("end time for prev track (%x): %f\n", prev, tstart);
}
// add this track
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 01:43:11 +0000