2014-12-01 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in 'utils/rdimport/rdimport.cpp' that failed to
	apply automatic segues correctly when the audio store was not
	locally accessible.
	* Fixed a bug in 'utils/rdimport/rdimport.cpp' that caused the
	value of the '--segue-level' options to be wrong by a factor of
	100.
	* Refactored the 'RDCut::autoSegue()' method to fetch trim data
	via 'RDTrimAudio'.
	* Added language in the rdimport(1) man page to resolve ambiguity
	regarding how the --segue-level location is dteremined when
	normalization is specified.
This commit is contained in:
Fred Gleason
2014-12-01 17:50:54 -05:00
parent 9e75d1c7da
commit f8d2a7905c
5 changed files with 41 additions and 20 deletions

View File

@@ -2,9 +2,7 @@
//
// A Batch Importer for Rivendell.
//
// (C) Copyright 2002-2008 Fred Gleason <fredg@paravelsystems.com>
//
// $Id: rdimport.cpp,v 1.34.4.9.2.3 2014/07/15 00:45:16 cvs Exp $
// (C) Copyright 2002-2014 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -532,8 +530,8 @@ MainObject::MainObject(QObject *parent,const char *name)
if(import_cmd->key(i)=="--segue-level") {
n=import_cmd->value(i).toInt(&ok);
if(ok&&(n<=0)) {
import_segue_level=100*n;
}
import_segue_level=n;
}
else {
fprintf(stderr,"rdimport: invalid segue level\n");
delete import_cmd;
@@ -1172,7 +1170,8 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
}
cut->setMetadata(wavedata);
}
cut->autoSegue(import_segue_level,import_segue_length);
cut->autoSegue(import_segue_level,import_segue_length,import_station,
import_user,import_config);
if((wavedata->title().length()==0)||
((wavedata->title().length()>0)&&(wavedata->title()[0] == '\0'))) {
QString title=effective_group->generateTitle(filename);