Commit 47c3eb26 authored by Josh Coalson's avatar Josh Coalson
Browse files

standardize flac__ names

parent 76911683
......@@ -46,14 +46,14 @@ static void update_stats(subframe_stats_t *stats, int32 residual, unsigned incr)
static void compute_stats(subframe_stats_t *stats);
static bool dump_stats(const subframe_stats_t *stats, const char *filename);
void analyze_init(analysis_options aopts)
void flac__analyze_init(analysis_options aopts)
{
if(aopts.do_residual_gnuplot) {
init_stats(&all_);
}
}
void analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analysis_options aopts, FILE *fout)
void flac__analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analysis_options aopts, FILE *fout)
{
const unsigned channels = frame->header.channels;
char outfilename[1024];
......@@ -130,7 +130,7 @@ void analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analysis_opt
}
}
void analyze_finish(analysis_options aopts)
void flac__analyze_finish(analysis_options aopts)
{
if(aopts.do_residual_gnuplot) {
compute_stats(&all_);
......
......@@ -24,8 +24,8 @@ typedef struct {
bool do_residual_gnuplot;
} analysis_options;
void analyze_init(analysis_options aopts);
void analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analysis_options aopts, FILE *fout);
void analyze_finish(analysis_options aopts);
void flac__analyze_init(analysis_options aopts);
void flac__analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analysis_options aopts, FILE *fout);
void flac__analyze_finish(analysis_options aopts);
#endif
......@@ -92,7 +92,7 @@ int flac__decode_wav(const char *infile, const char *outfile, bool analysis_mode
}
if(analysis_mode)
analyze_init(aopts);
flac__analyze_init(aopts);
if(!init(infile, &stream_info))
goto wav_abort_;
......@@ -145,7 +145,7 @@ int flac__decode_wav(const char *infile, const char *outfile, bool analysis_mode
if(verbose)
fprintf(stderr, "\n");
if(analysis_mode)
analyze_finish(aopts);
flac__analyze_finish(aopts);
if(md5_failure) {
fprintf(stderr, "%s: WARNING, MD5 signature mismatch\n", infile);
return 1;
......@@ -166,7 +166,7 @@ wav_abort_:
unlink(outfile);
}
if(analysis_mode)
analyze_finish(aopts);
flac__analyze_finish(aopts);
return 1;
}
......@@ -205,7 +205,7 @@ int flac__decode_raw(const char *infile, const char *outfile, bool analysis_mode
}
if(analysis_mode)
analyze_init(aopts);
flac__analyze_init(aopts);
if(!init(infile, &stream_info))
goto raw_abort_;
......@@ -258,7 +258,7 @@ int flac__decode_raw(const char *infile, const char *outfile, bool analysis_mode
if(verbose)
fprintf(stderr, "\n");
if(analysis_mode)
analyze_finish(aopts);
flac__analyze_finish(aopts);
if(md5_failure) {
fprintf(stderr, "%s: WARNING, MD5 signature mismatch\n", infile);
return 1;
......@@ -279,7 +279,7 @@ raw_abort_:
unlink(outfile);
}
if(analysis_mode)
analyze_finish(aopts);
flac__analyze_finish(aopts);
return 1;
}
......@@ -353,7 +353,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__FileDecoder *decoder,
print_stats(stream_info);
if(stream_info->analysis_mode) {
analyze_frame(frame, stream_info->frame_counter-1, stream_info->aopts, fout);
flac__analyze_frame(frame, stream_info->frame_counter-1, stream_info->aopts, fout);
}
else if(!stream_info->test_only) {
if(bps == 8) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment