Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-18 16:41:18 +02:00
Code Issues Projects Releases Wiki Activity

2015-02-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a '--auto-segue' switch to rdmarkerset(8) in
	'utils/rdmarkerset.cpp' and 'utils/rdmarkerset.h'.
	* Created a man page for rdmarkerset(8).
	* Added a reference to rdmarkerset(8) in the rdimport(1) man page.
This commit is contained in:
Fred Gleason
2015-02-06 14:00:29 -05:00
parent 4da946e36f
commit 10b626983f
7 changed files with 141 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
utils/rdmarkerset/rdmarkerset.cpp
View File

@@ -55,6 +55,8 @@ MainObject::MainObject(QObject *parent,const char *name)
set_all_groups=false;
set_auto_trim=1;
set_verbose=false;
set_auto_trim=1;
set_auto_segue=1;
//
// Read Command Options
@@ -82,6 +84,14 @@ MainObject::MainObject(QObject *parent,const char *name)
}
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--auto-segue") {
set_auto_segue=cmd->value(i).toInt(&ok);
if((!ok)||(set_auto_segue>0)) {
fprintf(stderr,
"rdmarkerset: invalid level value specified for --auto-segue\n");
}
cmd->setProcessed(i,true);
}
if(cmd->key(i)=="--verbose") {
set_verbose=true;
cmd->setProcessed(i,true);
@@ -103,6 +113,10 @@ MainObject::MainObject(QObject *parent,const char *name)
fprintf(stderr,"rdmarkerset: the --all-groups and --group=<group> options are mutually exclusive\n");
exit(256);
}
if((set_auto_trim<0)&&(set_auto_segue<0)&&(set_auto_trim>set_auto_segue)) {
fprintf(stderr,"rdmarkerset: segue cannot be placed after the end marker\n");
exit(256);
}
//
// Check for Root Perms
@@ -218,9 +232,23 @@ void MainObject::ProcessGroup(const QString &group_name)
q->value(1).toString(),q->value(2).toString());
}
else {
ClearAutoTrim(RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString()),
q->value(1).toString(),q->value(2).toString());
if(set_auto_trim==0) {
ClearAutoTrim(RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString()),
q->value(1).toString(),q->value(2).toString());
}
}
if(set_auto_segue<0) {
SetAutoSegue(RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString()),
q->value(1).toString(),q->value(2).toString());
}
else {
if(set_auto_segue==0) {
ClearAutoSegue(RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString()),
q->value(1).toString(),q->value(2).toString());
}
}
}
delete q;
@@ -333,6 +361,55 @@ void MainObject::ClearAutoTrim(unsigned cartnum,int cutnum,const QString &title,
}
void MainObject::SetAutoSegue(unsigned cartnum,int cutnum,const QString &title,
const QString &desc)
{
RDTrimAudio::ErrorCode err;
RDCart *cart=new RDCart(cartnum);
RDCut *cut=new RDCut(cartnum,cutnum);
RDTrimAudio *trimmer=new RDTrimAudio(set_station,set_config,this);
trimmer->setCartNumber(cartnum);
trimmer->setCutNumber(cutnum);
trimmer->setTrimLevel(100*set_auto_segue);
if((err=trimmer->runTrim(set_user->name(),set_user->password()))==
RDTrimAudio::ErrorOk) {
int end=trimmer->endPoint();
if(end<cut->endPoint()) {
cut->setSegueStartPoint(end);
cut->setSegueEndPoint(cut->endPoint());
Print(QString().sprintf(" setting segue-start for %06u / %03d [",
cartnum,cutnum)+title+" / "+desc+
QString().sprintf("] at %d dBFS",set_auto_segue));
}
else {
Print(QString().sprintf(" segue-start for %06u / %03d [",
cartnum,cutnum)+title+" / "+desc+
"] cannot be set beyond end marker");
}
}
else {
if(err!=RDTrimAudio::ErrorNoAudio) {
fprintf(stderr,"rdmarkerset: cart %06u, cut %d trimmer error [%s]\n",
cartnum,cutnum,(const char *)RDTrimAudio::errorText(err));
exit(256);
}
}
delete trimmer;
delete cut;
delete cart;
}
void MainObject::ClearAutoSegue(unsigned cartnum,int cutnum,
const QString &title,const QString &desc)
{
RDCut *cut=new RDCut(cartnum,cutnum);
cut->setSegueStartPoint(-1);
cut->setSegueEndPoint(-1);
delete cut;
}
void MainObject::Print(const QString &msg)
{
if(set_verbose) {