Ticket #2497: get_correct_file_extension.patch

libs/libmythtv/tv_rec.cpp

@@ -136 +136 @@
       // tvchain
       tvchain(NULL),
       // RingBuffer info
-      ringBuffer(NULL), rbFilePrefix(""), rbFileExt("mpg")
+      ringBuffer(NULL), rbFilePrefix("")
 {
 }
 
 bool TVRec::CreateChannel(const QString &startchannel)
 {
-    rbFileExt = "mpg";
     bool init_run = false;
     if (genOpt.cardtype == "DVB")
     {
@@ -227 +226 @@
         CloseChannel();
         init_run = true;
 #endif
-        if (genOpt.cardtype != "HDTV" && genOpt.cardtype != "MPEG")
-            rbFileExt = "nuv";
     }
 
     if (!init_run)
@@ -641 +638 @@
 {
     if (!curRec)
         return;
+        
+    QString rbFileExt;
+    
+    GetChannelFileExtension(curRec, rbFileExt);
 
     curRec->StartedRecording(rbFilePrefix, rbFileExt);
     VERBOSE(VB_RECORD, LOC + "StartedRecording("<<curRec<<") fn("
@@ -1115 +1116 @@
     channel->Close();
 }
 
+/** \fn TVRec::GetChannelFileExtension(const ProgramInfo *pi, QString &rbFileExt) const
+ *  \brief Returns the file extension for the corresponding recording.
+ *  By default, mpg is used.  Only if a V4L card is detected is the extension changed to nuv.
+ *  \param chanId Channel
+ *  \param fileExt Recording file extension.
+ */
+bool TVRec::GetChannelFileExtension(const QString& chanId, QString& fileExt) const
+{
+    QString test;
+    
+    fileExt = "mpg";
+    
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT cc.cardtype "
+                    "FROM channel ch "
+                    "JOIN cardinput ci "
+                      "ON ch.sourceid = ci.sourceid "
+                    "JOIN capturecard cc "
+                      "ON ( (ci.childcardid <> 0) AND "
+                           "(ci.childcardid = cc.cardid) )" 
+                           "OR "
+                         "( (ci.childcardid = 0) AND "
+                           "(ci.cardid = cc.cardid) ) "
+                  "WHERE ch.chanid = :CHANID");
+    query.bindValue(":CHANID", chanId);
+    
+    if (!query.exec() || !query.isActive())
+    {
+        MythContext::DBError("GetRecordingFileExtension", query);
+        return false;
+    }
+    
+    if (!query.next())
+        return false;
+        
+    test = query.value(0).toString();
+    if (test != QString::null)
+    {
+        if (test == "V4L")
+           fileExt = "nuv";  
+    }
+    
+    return true;
+}
+
 DBox2Channel *TVRec::GetDBox2Channel(void)
 {
 #ifdef USING_DBOX2

libs/libmythtv/tv_rec.h

@@ -254 +254 @@
     bool CreateChannel(const QString &startChanNum);
     void InitChannel(const QString &inputname, const QString &startchannel);
     void CloseChannel(void);
+    bool GetChannelFileExtension(const QString& chanId, QString& fileExt) const;
     DBox2Channel *GetDBox2Channel(void);
     HDHRChannel  *GetHDHRChannel(void);
     DVBChannel   *GetDVBChannel(void);
@@ -367 +368 @@
     // RingBuffer info
     RingBuffer  *ringBuffer;
     QString      rbFilePrefix;
-    QString      rbFileExt;
 
   public:
     static const uint kSignalMonitoringRate;