Patches from Anduin Withers to add a default timestretch value on a scheduled recording basis.

Closes #71 and #1.


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

Author: Isaac Richards

mythtv/libs/libmyth/mythcontext.h

@@ -162,7 +162,7 @@ class MythPrivRequest
 };
 
 #define MYTH_BINARY_VERSION "0.19.20050712-1"
-#define MYTH_PROTO_VERSION "17"
+#define MYTH_PROTO_VERSION "18"
 
 extern int print_verbose_messages;
 

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -1861,6 +1861,10 @@ void NuppelVideoPlayer::StartPlaying(void)
             return;
     }
 
+    if (audioOutput)
+        audioOutput->SetStretchFactor(audio_stretchfactor);
+    next_play_speed = audio_stretchfactor;
+
     if (!InitVideo())
     {
         qApp->lock();

mythtv/libs/libmythtv/dbcheck.cpp

@@ -10,7 +10,7 @@ using namespace std;
 #include "mythdbcon.h"
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1087";
+const QString currentDatabaseVersion = "1088";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -1944,7 +1944,19 @@ QString("ALTER TABLE videosource ADD COLUMN freqtable VARCHAR(16) NOT NULL DEFAU
         if (!performActualUpdate(updates, "1087", dbver))
             return false;
     }
-    
+ 
+    if (dbver == "1087")
+    {
+        const QString updates[] = {
+"ALTER TABLE record ADD COLUMN tsdefault FLOAT NOT NULL DEFAULT 1.0;",
+"ALTER TABLE recorded ADD COLUMN timestretch FLOAT NOT NULL DEFAULT 1.0;",
+"UPDATE record SET tsdefault = 1.0;", // we've had the default not take before
+"UPDATE recorded SET timestretch = 1.0;", 
+""
+};
+        performActualUpdate(updates, "1088", dbver);
+    }
+   
     return true;
 }
 

mythtv/libs/libmythtv/programinfo.cpp

@@ -66,6 +66,7 @@ ProgramInfo::ProgramInfo(void)
     year = "";
     stars = 0;
     availableStatus = asAvailable;    
+    timestretch = 1.0;
 
     pathname = "";
     filesize = 0;
@@ -193,6 +194,8 @@ ProgramInfo &ProgramInfo::clone(const ProgramInfo &other)
     hasAirDate = other.hasAirDate;
     repeat = other.repeat;
 
+    timestretch = other.timestretch;
+
     seriesid = other.seriesid;
     programid = other.programid;
     catType = other.catType;
@@ -286,6 +289,7 @@ void ProgramInfo::ToStringList(QStringList &list) const
     FLOAT_TO_LIST(stars)
     DATETIME_TO_LIST(QDateTime(originalAirDate))
     INT_TO_LIST(hasAirDate)     
+    FLOAT_TO_LIST(timestretch);
 }
 
 /** \fn ProgramInfo::FromStringList(QStringList&,int)
@@ -382,6 +386,7 @@ bool ProgramInfo::FromStringList(QStringList &list, QStringList::iterator &it)
     FLOAT_FROM_LIST(stars)
     DATE_FROM_LIST(originalAirDate);
     INT_FROM_LIST(hasAirDate);
+    FLOAT_FROM_LIST(timestretch);
 
     return true;
 }
@@ -546,6 +551,8 @@ void ProgramInfo::ToMap(QMap<QString, QString> &progMap) const
         progMap["REPEAT"] = "";
         progMap["LONGREPEAT"] = "";
     }
+
+    progMap["timestretch"] = QString::number(timestretch, 'f', 2);
 
     progMap["seriesid"] = seriesid;
     progMap["programid"] = programid;
@@ -692,7 +699,7 @@ ProgramInfo *ProgramInfo::GetProgramFromRecorded(const QString &channel,
                   "channel.callsign,channel.name,channel.commfree, "
                   "channel.outputfilters,seriesid,programid,filesize, "
                   "lastmodified,stars,previouslyshown,originalairdate, "
-                  "hostname,recordid,transcoder "
+                  "hostname,recordid,transcoder,timestretch "
                   "FROM recorded "
                   "LEFT JOIN channel "
                   "ON recorded.chanid = channel.chanid "
@@ -752,6 +759,8 @@ ProgramInfo *ProgramInfo::GetProgramFromRecorded(const QString &channel,
 
         proginfo->programflags = proginfo->getProgramFlags();
 
+        proginfo->timestretch = query.value(21).toString().toFloat();
+
         return proginfo;
     }
 
@@ -1213,11 +1222,12 @@ void ProgramInfo::StartedRecording(void)
     query.prepare("INSERT INTO recorded (chanid,starttime,endtime,title,"
                   " subtitle,description,hostname,category,recgroup,"
                   " autoexpire,recordid,seriesid,programid,stars,"
-                  " previouslyshown,originalairdate,findid,transcoder)"
+                  " previouslyshown,originalairdate,findid,transcoder,"
+                  " timestretch)"
                   " VALUES(:CHANID,:STARTS,:ENDS,:TITLE,:SUBTITLE,:DESC,"
                   " :HOSTNAME,:CATEGORY,:RECGROUP,:AUTOEXP,:RECORDID,"
                   " :SERIESID,:PROGRAMID,:STARS,:REPEAT,:ORIGAIRDATE,"
-                  " :FINDID,:TRANSCODER);");
+                  " :FINDID,:TRANSCODER,:TIMESTRETCH);");
     query.bindValue(":CHANID", chanid);
     query.bindValue(":STARTS", starts);
     query.bindValue(":ENDS", ends);
@@ -1236,6 +1246,7 @@ void ProgramInfo::StartedRecording(void)
     query.bindValue(":REPEAT", repeat);
     query.bindValue(":ORIGAIRDATE", originalAirDate);
     query.bindValue(":TRANSCODER", record->GetTranscoder());
+    query.bindValue(":TIMESTRETCH", timestretch);
 
     if (!query.exec() || !query.isActive())
         MythContext::DBError("WriteRecordedToDB", query);

mythtv/libs/libmythtv/programinfo.h

@@ -13,7 +13,7 @@ using namespace std;
 typedef QMap<long long, long long> frm_pos_map_t;
 typedef QMap<long long, int> frm_dir_map_t;
 
-#define NUMPROGRAMLINES 39
+#define NUMPROGRAMLINES 40
 
 typedef enum {
     MARK_UNSET = -10,
@@ -256,6 +256,8 @@ class ProgramInfo
     bool hasAirDate;
     bool repeat;
 
+    float timestretch;
+
     int spread;
     int startCol;
 

mythtv/libs/libmythtv/scheduledrecording.cpp

@@ -43,6 +43,7 @@ ScheduledRecording::ScheduledRecording()
     inactive = NULL;
     searchType = "";
     searchForWhat = "";
+    timestretchid = NULL;
 
     longChannelFormat = gContext->GetSetting("LongChannelFormat", "<num> <name>");
     channelFormat = gContext->GetSetting("ChannelFormat", "<num> <sign>");
@@ -786,6 +787,9 @@ void ScheduledRecording::setDefault(bool haschannel)
     recgroup->setValue("Default");
 
     inactive->setValue(0);
+
+    timestretchid->fillSelections();
+    timestretchid->setValue(QString::number(1.0f, 'f', 2));
 }
 
 void ScheduledRecording::setProgram(ProgramInfo *proginfo)

mythtv/libs/libmythtv/scheduledrecording.h

@@ -49,6 +49,7 @@ class SRProgramid;
 class SRFindDay;
 class SRFindTime;
 class SRFindId;
+class SRTimeStretch;
 class SRParentId;
 
 class ScheduledRecording: public ConfigurationGroup, public ConfigurationDialog {
@@ -161,6 +162,7 @@ class ScheduledRecording: public ConfigurationGroup, public ConfigurationDialog
     void setFindTimeObj(SRFindTime* val) {findtime = val;}
     void setFindIdObj(SRFindId* val) {findid = val;}
     void setParentIdObj(SRParentId* val) {parentid = val;}
+    void setTimeStretchIDObj(SRTimeStretch* val) {timestretchid = val;}
 
     void ToMap(QMap<QString, QString>& infoMap);
 
@@ -225,6 +227,7 @@ protected slots:
     class SRFindDay* findday;
     class SRFindTime* findtime;
     class SRFindId* findid;
+    SRTimeStretch* timestretchid;
     class SRParentId* parentid;
 
     ProgramInfo* m_pginfo;

mythtv/libs/libmythtv/sr_items.cpp

@@ -30,6 +30,9 @@ SRSchedOptionsGroup::SRSchedOptionsGroup(ScheduledRecording *_rec, ManagedList*
 
     inactive = new SRInactive(_rec, this, _parentList);
     addItem(inactive->getItem(), -1);
+
+    tsValue = new SRTimeStretch(_rec, _parentList, this);
+    addItem(tsValue->getItem(), -1);
 }
 
 
@@ -152,4 +155,32 @@ void SRRecGroup::showNewRecGroup()
     }
 }
 
+SRTimeStretch::SRTimeStretch(ScheduledRecording *_parent, ManagedList *_list,
+        ManagedListGroup *_group) : SRSelectSetting(_parent,
+        "timeStretchList", QString("[ %1 ]").arg(QObject::tr("Time Stretch")),
+        _group, "tsdefault", _list)
+{
+    _parent->setTimeStretchIDObj(this);
+}
+
+void SRTimeStretch::load()
+{
+    fillSelections();
+    SRSelectSetting::load();
+
+    setValue(QString::number(settingValue.toDouble(), 'f', 2));
+    setUnchanged();
+}
 
+void SRTimeStretch::fillSelections()
+{
+    clearSelections();
+    QString ts_text = QObject::tr("Default time stretch %1");
+    float tsfac = 0.5;
+    float tsstep = 0.05;
+    while (tsfac < 2.01) {
+        addSelection(ts_text.arg(tsfac, 0, 'f', 2),
+                QString::number(tsfac, 'f', 2));
+        tsfac += tsstep;
+    }
+}

mythtv/libs/libmythtv/sr_items.h

@@ -331,6 +331,7 @@ class SRSchedOptionsGroup : public ManagedListGroup
         class SREndOffset* endOffset;
         class SRDupMethod* dupMethItem;
         class SRDupIn* dupLocItem;
+        class SRTimeStretch* tsValue;
 
         ScheduledRecording *schedRec;
 };
@@ -793,5 +794,15 @@ class SRRecGroup: public SRSelectSetting
         void showNewRecGroup();
         void onGoingBack();
 };
+
+class SRTimeStretch : public SRSelectSetting 
+{
+    public:
+        SRTimeStretch(ScheduledRecording *_parent, ManagedList *_list,
+                ManagedListGroup *_group);
+        void load();
+        void fillSelections();
+};
+
 #endif
 

mythtv/libs/libmythtv/tv_play.cpp

@@ -537,6 +537,8 @@ int TV::Playback(ProgramInfo *rcinfo)
     else
         ChangeState(kState_WatchingPreRecorded);
 
+    normal_speed = playbackinfo->timestretch;
+
     if (class LCD * lcd = LCD::Get())
         lcd->switchToChannel(rcinfo->chansign, rcinfo->title, rcinfo->subtitle);
 
@@ -1045,6 +1047,8 @@ void TV::SetupPlayer(bool isWatchingRecording)
     nvp->SetExactSeeks(gContext->GetNumSetting("ExactSeeking"));
     nvp->SetAutoCommercialSkip(autoCommercialSkip);
 
+    nvp->SetAudioStretchFactor(normal_speed);
+
     if (gContext->GetNumSetting("DefaultCCMode"))
         nvp->ToggleCC(vbimode, 0);