2014-10-25 Fred Gleason <fredg@paravelsystems.com>

* Implemented '--set-marker-fadedown=' and '--set-marker-fadeup*='
	options for rdimport(1) in 'utils/rdimport/markerset.cpp',,
	'utils/rdimport/markerset.h', 'utils/rdimport/rdimport.cpp' and
	'utils/rdimport/rdimport.h'.

ChangeLog

@@ -14582,3 +14582,8 @@
 	options for rdimport(1) in 'utils/rdimport/markerset.cpp',,
 	'utils/rdimport/markerset.h', 'utils/rdimport/rdimport.cpp' and
 	'utils/rdimport/rdimport.h'.
+2014-10-25 Fred Gleason <fredg@paravelsystems.com>
+	* Implemented '--set-marker-fadedown=' and '--set-marker-fadeup*='
+	options for rdimport(1) in 'utils/rdimport/markerset.cpp',,
+	'utils/rdimport/markerset.h', 'utils/rdimport/rdimport.cpp' and
+	'utils/rdimport/rdimport.h'.

docs/man/rdimport.1

@@ -20,53 +20,65 @@ list of filespecs to be read from standard input.
 Add Scheduler Code <\fIstr\fP> to the target cart.  The specified
 code must exist in RDAdmin->SchedulerCodes.  This option may be
 specified multiple times.
+
 .TP
 .B --autotrim-level=<level>
 Specify the threshold level to use for autotrimming the audio, in dBFS.
 Specifying '0' will turn off autotrimming.
+
 .TP
 .B --cart-number-offset=<\fIoffset\fP>
 Add <\fIoffset\fP> to the cart number as determined from metadata pattern
 or --use-cartchunk-cutid.
+
 .TP
 .B --create-enddate-offset=<\fIdays\fP>
 If the imported file does not reference an end date, create with
 end date offset by <\fIdays\fP> days relative to the current date.
 Cannot be less than the value the value for \fB--create-startdate-offset\fP
 (default = 0).
+
 .TP
 .B --create-startdate-offset=<\fIdays\fP>
 If the imported file does not reference a start date, create with 
 startdate offset by <\fIdays\fP> days relative to the current date.
 Cannot be greater than the value for \fB--create-enddate-offset\fP
 (default = 0).
+
 .TP
 .B --delete-cuts
 Delete all cuts within the destination cart before importing.  Use
 with caution!
+
 .TP
 .B --delete-source
 Delete each source file after successful import.  Use with caution!
+
 .TP
 .B --drop-box
 Operate in DropBox mode, causing \fIrdimport(1)\fP to run continuously,
 periodically scanning for files matching the specified <\fIfilespec\fP>,
 importing and then deleting them when found.  WARNING:  use of this option
 also implies the \fB--delete-source\fP option!
+
 .TP
 .B --enddate-offset=<days>
 If the imported file references an end date, offset the value by <\fIdays\fP>
 days.
+
 .TP
 .B --fix-broken-formats
 Attempt to work around malformed audio input data.
+
 .TP
 .B --help
 Print a short usage message and exit.
+
 .TP
 .B --log-mode
 Prepend date/time information to each line of printed status (implies
 the '--verbose' option).
+
 .TP
 .B --metadata-pattern=<\fIpattern\fP>
 Attempt to read metadata parameters from the source filename, using
@@ -140,20 +152,25 @@ characters between macros.  For example, the pattern '%t_%a_%g_%n.',
 when processing a filename of 'My Song_My Artist_TEMP_123456.mp3',
 would extract 'My Song' as the title and 'My Artist' as the artist,
 while importing it into cart 123456 in the TEMP group.
+
 .TP
 .B --normalization-level=<\fIlevel\fP>
 Specify the level to use for peak normalizing the audio, in dBFS.
 Specifying '0' will turn off normalization.
+
 .TP
 .B --segue-length=<\fIlength\fP>
 Length of the added segue in msecs.  See \fB--segue-level\fP below.
+
 .TP
 .B --segue-level=<\fIlevel\fP>
 Specify the threshold level to use for setting the segue markers, in dBFS.
 Default action is not to create segue markers.
+
 .TP
 .B --set-daypart-times=<\fIstart-time\fP>,<\fIend-time\fP>
 Set the start and end daypart times, in the format HHMMSS.
+
 .TP
 .B --set-marker-end-<\fImarker\fP>=<\fIoffset\fP>
 Set an end marker to a given offset value.  The <\fIoffset\fP> parameter is
@@ -179,27 +196,44 @@ The Talk markers.
 .RE
 .RE
 
+.TP
+.B --set-marker-fadedown=<\fIoffset\fP>
+Set the FadeDown marker to a given offset value.  See the discussion of the
+\fB--set-marker-end-<marker>\fP option above for a description of the
+<\fIoffset\fP> parameter.
+
+.TP
+.B --set-marker-fadeup=<\fIoffset\fP>
+Set the FadeUp marker to a given offset value.  See the discussion of the
+\fB--set-marker-end-<marker>\fP option above for a description of the
+<\fIoffset\fP> parameter.
+
 .TP
 .B --set-marker-start-<\fImarker\fP>=<\fIoffset\fP>
 Set a start marker to a given offset value.  See the discussion of the
 \fB--set-marker-end-<marker>\fP option above for a description of the
 <\fImarker\fP> and <\fIoffset\fP> parameters.
+
 .TP
 .B --set-user-defined=<\fIstr\fP>
 Set the User Defined field for the target cart to <\fIstr\fP>.  This will
 override any value that might otherwise be set --e.g. by using the
 \fB--metadata-pattern\fP option.
+
 .TP
 .B --single-cart
 If more than one file is imported, place them within multiple cuts within a
 single cart, rather than creating separate carts for each file.
+
 .TP
 .B --startdate-offset=<\fIdays\fP>
 If the imported file references a start date, offset the value by <\fIdays\fP>
 days.
+
 .TP
 .B --title-from-cartchunk-cutid
 Set the cart title from CartChunk CutID.
+
 .TP
 .B --to-cart=<\fIcartnum\fP>
 Specify the cart to import the audio into, rather than using the next
@@ -207,15 +241,18 @@ available cart number for the group.  If the cart does not exist, it will
 be created.  Each file will be imported into a separate new cut within the
 cart.  Use of this option implies the \fB--single-cart\fP option as well,
 and is mutually exclusive with the \fB--use-cartchunk-cutid\fP option.
+
 .TP
 .B --use-cartchunk-cutid
 Import the audio into the cart specified by the CartChunk CutID parameter
 associated with the file.  If the cart does not exist, it will be
 created.  Use of this option is mutually exclusive with the \fB--to-cart\fP
 option.
+
 .TP
 .B --verbose
 Print progress messages during processing.
+
 .TP
 .B --version
 Output version information and exit.

utils/rdimport/markerset.cpp

@@ -29,6 +29,8 @@ MarkerSet::MarkerSet()
   marker_start_value=0;
   marker_end_valid=false;
   marker_end_value=0;
+  marker_fade_valid=false;
+  marker_fade_value=0;
   marker_audio_length=0;
 }
 
@@ -41,7 +43,7 @@ bool MarkerSet::hasStartValue() const
 
 int MarkerSet::startValue(int lo_limit,int hi_limit) const
 {
-  return LimitCheck(marker_start_value,lo_limit,hi_limit);
+  return LimitCheck(FrontReference(marker_start_value),lo_limit,hi_limit);
 }
 
 
@@ -53,11 +55,23 @@ bool MarkerSet::hasEndValue() const
 
 int MarkerSet::endValue(int lo_limit,int hi_limit) const
 {
-  return LimitCheck(marker_end_value,lo_limit,hi_limit);
+  return LimitCheck(FrontReference(marker_end_value),lo_limit,hi_limit);
 }
 
 
-void MarkerSet::load(RDCmdSwitch *cmd,const QString &marker)
+bool MarkerSet::hasFadeValue() const
+{
+  return marker_fade_valid;
+}
+
+
+int MarkerSet::fadeValue(int lo_limit,int hi_limit) const
+{
+  return LimitCheck(FrontReference(marker_fade_value),lo_limit,hi_limit);
+}
+
+
+void MarkerSet::loadMarker(RDCmdSwitch *cmd,const QString &marker)
 {
   QString start_key="--set-marker-start-"+marker;
   QString end_key="--set-marker-end-"+marker;
@@ -89,6 +103,24 @@ void MarkerSet::load(RDCmdSwitch *cmd,const QString &marker)
 }
 
 
+void MarkerSet::loadFade(RDCmdSwitch *cmd,const QString &marker)
+{
+  QString key="--set-marker-"+marker;
+  marker_marker=marker;
+  for(unsigned i=0;i<cmd->keys();i++) {
+    if(cmd->key(i)==key) {
+      marker_fade_value=cmd->value(i).toInt(&marker_fade_valid);
+      if(!marker_fade_valid) {
+	fprintf(stderr,"rdimport: invalid argment to %s\n",
+		(const char *)key);
+	exit(255);
+      }
+      cmd->setProcessed(i,true);
+    }
+  }
+}
+
+
 void MarkerSet::setAudioLength(int msecs)
 {
   if(marker_start_valid&&(!marker_end_valid)) {

utils/rdimport/markerset.h

@@ -31,7 +31,10 @@ class MarkerSet
   int startValue(int lo_limit=-1,int hi_limit=-1) const;
   bool hasEndValue() const;
   int endValue(int lo_limit=-1,int hi_limit=-1) const;
-  void load(RDCmdSwitch *cmd,const QString &marker);
+  bool hasFadeValue() const;
+  int fadeValue(int lo_limit=-1,int hi_limit=-1) const;
+  void loadMarker(RDCmdSwitch *cmd,const QString &marker);
+  void loadFade(RDCmdSwitch *cmd,const QString &marker);
   void setAudioLength(int msecs);
   void dump();
 
@@ -43,6 +46,8 @@ class MarkerSet
   int marker_start_value;
   bool marker_end_valid;
   int marker_end_value;
+  bool marker_fade_valid;
+  int marker_fade_value;
   int marker_audio_length;
 };
 

utils/rdimport/rdimport.cpp

@@ -247,13 +247,17 @@ MainObject::MainObject(QObject *parent,const char *name)
     }
   }
   import_cut_markers=new MarkerSet();
-  import_cut_markers->load(import_cmd,"cut");
+  import_cut_markers->loadMarker(import_cmd,"cut");
   import_talk_markers=new MarkerSet();
-  import_talk_markers->load(import_cmd,"talk");
+  import_talk_markers->loadMarker(import_cmd,"talk");
   import_hook_markers=new MarkerSet();
-  import_hook_markers->load(import_cmd,"hook");
+  import_hook_markers->loadMarker(import_cmd,"hook");
   import_segue_markers=new MarkerSet();
-  import_segue_markers->load(import_cmd,"segue");
+  import_segue_markers->loadMarker(import_cmd,"segue");
+  import_fadedown_marker=new MarkerSet();
+  import_fadedown_marker->loadFade(import_cmd,"fadedown");
+  import_fadeup_marker=new MarkerSet();
+  import_fadeup_marker->loadFade(import_cmd,"fadeup");
 
   //
   // Read Configuration
@@ -520,6 +524,8 @@ MainObject::MainObject(QObject *parent,const char *name)
     import_talk_markers->dump();
     import_hook_markers->dump();
     import_segue_markers->dump();
+    import_fadedown_marker->dump();
+    import_fadeup_marker->dump();
     printf(" Files to process:\n");
     for(unsigned i=import_file_key;i<import_cmd->keys();i++) {
       printf("   \"%s\"\n",(const char *)import_cmd->key(i));
@@ -1041,6 +1047,14 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
     cut->setSegueStartPoint(import_segue_markers->startValue(lo,hi));
     cut->setSegueEndPoint(import_segue_markers->endValue(lo,hi));
   }
+  import_fadedown_marker->setAudioLength(wavefile->getExtTimeLength());
+  if(import_fadedown_marker->hasFadeValue()) {
+    cut->setFadedownPoint(import_fadedown_marker->fadeValue(lo,hi));
+  }
+  import_fadeup_marker->setAudioLength(wavefile->getExtTimeLength());
+  if(import_fadeup_marker->hasFadeValue()) {
+    cut->setFadeupPoint(import_fadeup_marker->fadeValue(lo,hi));
+  }
   delete settings;
   delete conv;
   delete cut;

utils/rdimport/rdimport.h

@@ -133,6 +133,8 @@ class MainObject : public QObject
   MarkerSet *import_talk_markers;
   MarkerSet *import_hook_markers;
   MarkerSet *import_segue_markers;
+  MarkerSet *import_fadedown_marker;
+  MarkerSet *import_fadeup_marker;
 };