Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 9 additions and 7 deletions.
  1. +9 −0 input/flac/FlacPlugin.cpp
  2. +0 −7 input/mad/mad_engine.c
View
9 input/flac/FlacPlugin.cpp
@@ -83,6 +83,14 @@ flac_nr_blocks (input_object * obj)
return obj->nr_blocks;
}
+static int64_t
+flac_frame_count (input_object * obj)
+{
+ if (!obj)
+ return 0;
+ return ((int64_t) obj->nr_blocks) * obj->block_size;
+}
+
static long
flac_block_to_centisec (input_object * obj, int block)
@@ -340,6 +348,7 @@ input_plugin_info (void)
flac_plugin.block_seek = flac_block_seek;
flac_plugin.block_size = flac_block_size;
flac_plugin.nr_blocks = flac_nr_blocks;
+ flac_plugin.frame_count = flac_frame_count;
flac_plugin.block_to_sec = flac_block_to_centisec;
flac_plugin.sample_rate = flac_sample_rate;
flac_plugin.channels = flac_channels;
View
7 input/mad/mad_engine.c
@@ -402,13 +402,6 @@ static int mad_nr_blocks(input_object *obj)
{
if (!obj)
return 0;
-
- {
- struct mad_local_data *data = (struct mad_local_data *)obj->local_data;
- printf ("%s : nr_blocks (%s) %d, samplerate %d, channels %d\n", __func__,
- data->filename, obj->nr_blocks, data->samplerate, data->synth.pcm.channels) ;
- }
-
return obj->nr_blocks;
}

No commit comments for this range

Something went wrong with that request. Please try again.