Ticket #6833: hvr1300_0.23rc2_working-but-not-properly.patch

File hvr1300_0.23rc2_working-but-not-properly.patch, 2.2 KB (added by radu.cx+mythtv@…, 10 years ago)

Attempted refresh of the original patch (try 2)

  • mythtv/libs/libmythtv/mpegrecorder.h

    class MpegRecorder : public DTVRecorder, 
    3434    void Initialize(void) {}
    3535    void StartRecording(void);
    3636    void StopRecording(void);
     37    void FinishRecording(void);
    3738    void Reset(void);
    3839
    3940    void Pause(bool clear = true);
  • mythtv/libs/libmythtv/tv_play.cpp

    bool TV::StartPlayer(PlayerContext *mctx, PlayerCo 
    51675167
    51685168    InitUDPNotifyEvent();
    51695169    bool ok = false;
     5170    if (ctx->HasNVP())
     5171    {
     5172        VERBOSE(VB_PLAYBACK, LOC + QString("StartPlayer: tearing down existing NVP"));
     5173        ctx->SetNVP(NULL);
     5174    }
     5175
    51705176    if (ctx->IsNullVideoDesired())
    51715177    {
    51725178        ok = ctx->CreateNVP(this, NULL, desiredState, 0, NULL);
  • mythtv/libs/libmythtv/mpegrecorder.cpp

    bool MpegRecorder::OpenV4L2DeviceAsInput(void) 
    431431        }
    432432        else
    433433        {
    434             VERBOSE(VB_IMPORTANT, "\n\nNot ivtv or pvrusb2 or hdpvr driver\n\n");
     434            VERBOSE(VB_IMPORTANT, QString("\n\nNot ivtv or pvrusb2 or hdpvr driver: %1\n\n").arg(driver));
    435435            bufferSize    = 4096;
    436436            usingv4l2     = has_v4l2_vbi = true;
    437437            has_buggy_vbi = requires_special_pause = false;
    bool MpegRecorder::ProcessAVTSPacket(const TSPacke 
    13861386void MpegRecorder::StopRecording(void)
    13871387{
    13881388    QMutexLocker locker(&recording_wait_lock);
    1389     if (recording)
     1389    if (recording && encoding)
    13901390    {
    13911391        encoding = false; // force exit from StartRecording() while loop
    13921392        recording_wait.wait(&recording_wait_lock);
    13931393    }
    13941394}
    13951395
     1396void MpegRecorder::FinishRecording(void)
     1397{
     1398    DTVRecorder::FinishRecording();
     1399    TeardownAll();
     1400}
     1401
    13961402void MpegRecorder::ResetForNewFile(void)
    13971403{
    13981404    DTVRecorder::ResetForNewFile();