Changeset 65bcb3938 in mythtv

Timestamp:

Dec 31, 2009, 9:57:50 PM (15 years ago)

Author:

Daniel Kristjansson <dkristjansson@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, devel/gpu-commflag, fixes/0.23, fixes/0.24, fixes/0.25, fixes/0.26, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

94c11af802

Parents:

ae87d9d58

Message:

Adds an import recorder.

This was written for my own frontend testing purposes. But with Chris Petersen's system events patch I think this can have more general usefulness.

The old method to use this was to look at the log and move the file into place.. but now you can actually just tie it to a script that is run on the recorded started event.

Mine just has this:
#!/bin/bash
echo start /bin/bash >> /tmp/rec-events.log
cp /video/testing/resolution-change.mpg /video/_.mpg
echo end /bin/bash >> /tmp/rec-events.log

With a RecordingStarted? event of /home/danielk/RecordingStarted.sh %CHANID% %STARTTIME%

git-svn-id: ​http://svn.mythtv.org/svn/trunk@23044 7dbf422c-18fa-0310-86e9-fd20926502f2

Location:

mythtv/libs/libmythtv

Files:

• cardutil.cpp (modified) (2 diffs)
• cardutil.h (modified) (5 diffs)
• dbcheck.cpp (modified) (3 diffs)
• importrecorder.cpp (added)
• importrecorder.h (added)
• libmythtv.pro (modified) (1 diff)
• tv_rec.cpp (modified) (6 diffs)
• videosource.cpp (modified) (3 diffs)

mythtv/libs/libmythtv/cardutil.cpp

@@ -1622 +1622 @@
     QStringList ret;
 
-    if (("FIREWIRE"  == cardtype) ||
-        ("FREEBOX"   == cardtype) ||
-        ("HDHOMERUN" == cardtype))
-    {
+    if (IsSingleInputCard(cardtype))
         ret += "MPEG2TS";
-    }
     else if ("DVB" == cardtype)
         ret += ProbeDVBInputs(device);
@@ -1751 +1747 @@
     bool is_dtv = !IsEncoder(cardtype) && !IsUnscanable(cardtype);
 
-    if (("FIREWIRE"  == cardtype) ||
-        ("FREEBOX"   == cardtype) ||
-        ("HDHOMERUN" == cardtype))
-    {
+    if (IsSingleInputCard(cardtype))
         inputs += "MPEG2TS";
-    }
     else if ("DVB" != cardtype)
         inputs += ProbeV4LVideoInputs(device);

mythtv/libs/libmythtv/cardutil.h

@@ -60 +60 @@
         HDPVR     = 12,
         DVBS2     = 13,
+        IMPORT    = 14,
     };
 
@@ -92 +93 @@
         if ("DVB_S2" == name)
             return DVBS2;
+        if ("IMPORT" == name)
+            return IMPORT;
         return ERROR_UNKNOWN;
     }
@@ -99 +102 @@
         return
             (rawtype != "DVB")       &&
-            (rawtype != "FIREWIRE")  &&
+            (rawtype != "FIREWIRE")  && (rawtype != "IMPORT") &&
             (rawtype != "HDHOMERUN") && (rawtype != "FREEBOX");
     }
@@ -111 +114 @@
     {
         return
-            (rawtype == "FIREWIRE")  ||
+            (rawtype == "FIREWIRE")  || (rawtype == "IMPORT") ||
             (rawtype == "HDPVR"      || (rawtype == "V4L"));
     }
@@ -139 +142 @@
             (rawtype == "V4L")    || (rawtype == "MPEG") ||
             (rawtype == "HDPVR");
+    }
+
+    static bool         IsSingleInputCard(const QString &rawtype)
+    {
+        return
+            (rawtype == "FIREWIRE")  || (rawtype == "FREEBOX") ||
+            (rawtype == "HDHOMERUN") || (rawtype == "IMPORT");
     }
 

mythtv/libs/libmythtv/dbcheck.cpp

@@ -18 +18 @@
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1247";
+const QString currentDatabaseVersion = "1248";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
@@ -135 +135 @@
 
 The 'defaultinput' field is a another important field for all
-cards except "FIREWIRE", "FREEBOX" and "HDHOMERUN" cards.
+cards except "FIREWIRE", "FREEBOX", "HDHOMERUN", and "IMPORT" cards.
 It specifies which
 input of the card to use. This does not have to mean a specific
@@ -4937 +4937 @@
        if (!performActualUpdate(updates, "1247", dbver))
             return false;
-
-       
-
+    }
+
+    if (dbver == "1247")
+    {
+        const char *updates[] = {
+"INSERT INTO profilegroups SET name = \"Import Recorder\", cardtype = 'IMPORT', is_default = 1;",
+"INSERT INTO recordingprofiles SET name = \"Default\", profilegroup = 14;",
+"INSERT INTO recordingprofiles SET name = \"Live TV\", profilegroup = 14;",
+"INSERT INTO recordingprofiles SET name = \"High Quality\", profilegroup = 14;",
+"INSERT INTO recordingprofiles SET name = \"Low Quality\", profilegroup = 14;",
+NULL
+};
+        if (!performActualUpdate(updates, "1248", dbver))
+            return false;
     }
 

mythtv/libs/libmythtv/libmythtv.pro

@@ -425 +425 @@
     SOURCES += dtvrecorder.cpp
 
+    # Import recorder
+    HEADERS += importrecorder.h
+    SOURCES += importrecorder.cpp
+
     # Simple NuppelVideo Recorder
     using_ffmpeg_threads:DEFINES += USING_FFMPEG_THREADS

mythtv/libs/libmythtv/tv_rec.cpp

@@ -55 +55 @@
 #include "iptvrecorder.h"
 #include "firewirerecorder.h"
+#include "importrecorder.h"
 
 #include "channelgroup.h"
@@ -180 +181 @@
 #endif
     }
-    else if (genOpt.cardtype == "MPEG" &&
-             genOpt.videodev.toLower().left(5) == "file:")
+    else if ((genOpt.cardtype == "IMPORT") ||
+             (genOpt.cardtype == "MPEG" &&
+              genOpt.videodev.toLower().left(5) == "file:"))
     {
         channel = new DummyChannel(this);
@@ -395 +397 @@
 
     // If this isn't a recording for this instance to make, we are done
-    if (rcinfo->cardid != cardid)
+    if (rcinfo->cardid != (uint)cardid)
         return;
 
@@ -1016 +1018 @@
         recorder->SetOption("mrl", genOpt.videodev);
 #endif // USING_IPTV
+    }
+    else if (genOpt.cardtype == "IMPORT")
+    {
+        recorder = new ImportRecorder(this);
     }
     else
@@ -1618 +1624 @@
     if ((1 == pendingRecordings.size()) &&
         (*it).ask &&
-        ((*it).info->cardid == cardid) &&
+        ((*it).info->cardid == (uint)cardid) &&
         (GetState() == kState_WatchingLiveTV))
     {
@@ -3992 +3998 @@
     if (lastTuningRequest.flags & kFlagRecording)
     {
-        SetRingBuffer(new RingBuffer(rec->GetFileName(), true));
-        if (!ringBuffer->IsOpen())
+        bool write = genOpt.cardtype != "IMPORT";
+        VERBOSE(VB_IMPORTANT, LOC + QString("rec->GetFileName(): '%1'")
+                .arg(rec->GetFileName()));
+        SetRingBuffer(new RingBuffer(rec->GetFileName(), write));
+        if (!ringBuffer->IsOpen() && write)
         {
             VERBOSE(VB_IMPORTANT, LOC_ERR +

mythtv/libs/libmythtv/videosource.cpp

@@ -1633 +1633 @@
 };
 
+class ImportConfigurationGroup : public VerticalConfigurationGroup
+{
+  public:
+    ImportConfigurationGroup(CaptureCard& a_parent):
+       VerticalConfigurationGroup(false, true, false, false),
+       parent(a_parent)
+    {
+        setUseLabel(false);
+        addChild(new SingleCardInput(parent));
+    };
+
+  private:
+    CaptureCard &parent;
+};
+
 class HDHomeRunExtra : public ConfigurationWizard
 {
@@ -1998 +2013 @@
     addTarget("FREEBOX",   new IPTVConfigurationGroup(parent));
 #endif // USING_IPTV
+
+    addTarget("IMPORT",    new ImportConfigurationGroup(parent));
 }
 
@@ -2201 +2218 @@
     setting->addSelection(QObject::tr("Network Recorder"), "FREEBOX");
 #endif // USING_IPTV
+
+    setting->addSelection(QObject::tr("Import Recorder"), "IMPORT");
 }