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

* Implemented '--set-string-description' and '--set-string-outcue'
	options for rdimport(1) in 'utils/rdimport/rdimport.cpp' and
	'utils/rdimport/rdimport.h'.

ChangeLog

@@ -14593,3 +14593,7 @@
 2014-10-25 Fred Gleason <fredg@paravelsystems.com>
 	* Implemented '--set-string-*=' options for rdimport(1) in
 	'utils/rdimport/rdimport.cpp' and 'utils/rdimport/rdimport.h'.
+2014-10-26 Fred Gleason <fredg@paravelsystems.com>
+	* Implemented '--set-string-description' and '--set-string-outcue'
+	options for rdimport(1) in 'utils/rdimport/rdimport.cpp' and
+	'utils/rdimport/rdimport.h'.

docs/man/rdimport.1

@@ -239,6 +239,12 @@ Client Name
 .B composer
 Music Composer Name
 .TP
+.B description
+Cut Description
+.TP
+.B outcue
+Cut Outcue
+.TP
 .B conductor
 Conductor Name
 .TP

utils/rdimport/rdimport.cpp

@@ -279,14 +279,22 @@ MainObject::MainObject(QObject *parent,const char *name)
       import_string_conductor=import_cmd->value(i);
       import_cmd->setProcessed(i,true);
     }
-    if(import_cmd->key(i)=="--set-string-publisher") {
+    if(import_cmd->key(i)=="--set-string-description") {
-      import_string_publisher=import_cmd->value(i);
+      import_string_description=import_cmd->value(i);
       import_cmd->setProcessed(i,true);
     }
     if(import_cmd->key(i)=="--set-string-label") {
       import_string_label=import_cmd->value(i);
       import_cmd->setProcessed(i,true);
     }
+    if(import_cmd->key(i)=="--set-string-outcue") {
+      import_string_outcue=import_cmd->value(i);
+      import_cmd->setProcessed(i,true);
+    }
+    if(import_cmd->key(i)=="--set-string-publisher") {
+      import_string_publisher=import_cmd->value(i);
+      import_cmd->setProcessed(i,true);
+    }
     if(import_cmd->key(i)=="--set-string-song-id") {
       import_string_song_id=import_cmd->value(i);
       import_cmd->setProcessed(i,true);
@@ -311,7 +319,6 @@ MainObject::MainObject(QObject *parent,const char *name)
       }
       import_cmd->setProcessed(i,true);
     }
-
   }
   import_cut_markers=new MarkerSet();
   import_cut_markers->loadMarker(import_cmd,"cut");
@@ -608,9 +615,16 @@ MainObject::MainObject(QObject *parent,const char *name)
     if(!import_string_conductor.isNull()) {
       printf(" Conductor set to: %s\n",(const char *)import_string_conductor);
     }
+    if(!import_string_description.isNull()) {
+      printf(" Description set to: %s\n",
+	     (const char *)import_string_description);
+    }
     if(!import_string_label.isNull()) {
       printf(" Label set to: %s\n",(const char *)import_string_label);
     }
+    if(!import_string_outcue.isNull()) {
+      printf(" Outcue set to: %s\n",(const char *)import_string_outcue);
+    }
     if(!import_string_publisher.isNull()) {
       printf(" Publisher set to: %s\n",(const char *)import_string_publisher);
     }
@@ -1151,9 +1165,15 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
   if(!import_string_conductor.isNull()) {
     cart->setConductor(import_string_conductor);
   }
+  if(!import_string_description.isNull()) {
+    cut->setDescription(import_string_description);
+  }
   if(!import_string_label.isNull()) {
     cart->setLabel(import_string_label);
   }
+  if(!import_string_outcue.isNull()) {
+    cut->setOutcue(import_string_outcue);
+  }
   if(!import_string_publisher.isNull()) {
     cart->setPublisher(import_string_publisher);
   }

utils/rdimport/rdimport.h

@@ -125,6 +125,8 @@ class MainObject : public QObject
   QString import_string_client;
   QString import_string_composer;
   QString import_string_conductor;
+  QString import_string_description;
+  QString import_string_outcue;
   QString import_string_publisher;
   QString import_string_label;
   QString import_string_song_id;