From 15a771e144a6eae578bd7e030a40f9d0c3e0f5f5 Mon Sep 17 00:00:00 2001
From: Gary Buhrmaster <gary.buhrmaster@gmail.com>
Date: Sun, 3 Nov 2013 19:10:56 +0000
Subject: [PATCH] Enhance tv_rec recording profile info message with cardid

---
 mythtv/libs/libmythtv/tv_rec.cpp | 15 +++++++--------
 mythtv/libs/libmythtv/tv_rec.h   |  3 +++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
index 0acc86808d0..21ae17fd4fb 100644
--- a/mythtv/libs/libmythtv/tv_rec.cpp
+++ b/mythtv/libs/libmythtv/tv_rec.cpp
@@ -50,7 +50,6 @@ QMutex            TVRec::cardsLock;
 QMap<uint,TVRec*> TVRec::cards;
 
 static bool is_dishnet_eit(uint cardid);
-static QString load_profile(QString,void*,RecordingInfo*,RecordingProfile&);
 static int init_jobs(const RecordingInfo *rec, RecordingProfile &profile,
                      bool on_host, bool transcode_bfr_comm, bool on_line_comm);
 static void apply_broken_dvb_driver_crc_hack(ChannelBase*, MPEGStreamData*);
@@ -1817,7 +1816,7 @@ bool TVRec::SetupDTVSignalMonitor(bool EITscan)
     QString recording_type = "all";
     RecordingInfo *rec = lastTuningRequest.program;
     RecordingProfile profile;
-    load_profile(genOpt.cardtype, tvchain, rec, profile);
+    LoadProfile(genOpt.cardtype, tvchain, rec, profile);
     const Setting *setting = profile.byName("recordingtype");
     if (setting)
         recording_type = setting->getValue();
@@ -2756,7 +2755,7 @@ void TVRec::InitAutoRunJobs(RecordingInfo *rec, AutoRunInitType t,
         RecordingProfile profile;
         if (!recpro)
         {
-            load_profile(genOpt.cardtype, NULL, rec, profile);
+            LoadProfile(genOpt.cardtype, NULL, rec, profile);
             recpro = &profile;
         }
         autoRunJobs[rec->MakeUniqueKey()] =
@@ -4047,8 +4046,8 @@ static int init_jobs(const RecordingInfo *rec, RecordingProfile &profile,
     return jobs;
 }
 
-static QString load_profile(QString cardtype, void *tvchain,
-                            RecordingInfo *rec, RecordingProfile &profile)
+QString TVRec::LoadProfile(QString cardtype, void *tvchain,
+                           RecordingInfo *rec, RecordingProfile &profile)
 {
     // Determine the correct recording profile.
     // In LiveTV mode use "Live TV" profile, otherwise use the
@@ -4063,8 +4062,8 @@ static QString load_profile(QString cardtype, void *tvchain,
         profileName = "Default";
         profile.loadByType(profileName, cardtype);
     }
-
-    LOG(VB_RECORD, LOG_INFO, QString("Using profile '%1' to record")
+    LOG(VB_RECORD, LOG_INFO, LOC +
+        QString("Using profile '%1' to record")
             .arg(profileName));
 
     return profileName;
@@ -4089,7 +4088,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
     RecordingInfo *rec = lastTuningRequest.program;
 
     RecordingProfile profile;
-    QString profileName = load_profile(genOpt.cardtype, tvchain, rec, profile);
+    QString profileName = LoadProfile(genOpt.cardtype, tvchain, rec, profile);
 
     if (tvchain)
     {
diff --git a/mythtv/libs/libmythtv/tv_rec.h b/mythtv/libs/libmythtv/tv_rec.h
index fcadd7097be..54c6a86760f 100644
--- a/mythtv/libs/libmythtv/tv_rec.h
+++ b/mythtv/libs/libmythtv/tv_rec.h
@@ -323,6 +323,9 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
     void SetRecordingStatus(
         RecStatusType new_status, int line, bool have_lock = false);
 
+    QString LoadProfile(QString ,void*, RecordingInfo*,
+                        RecordingProfile&);
+
     // Various components TVRec coordinates
     RecorderBase     *recorder;
     ChannelBase      *channel;