Radio navigation

diff --git a/playerradio.cc b/playerradio.cc
index f3e4b83971f28c6ac40566d0f2f6bd437e31e253..dcf18ea0af92b6d10b806f0561113284f8a41284 100644 (file)
--- a/playerradio.cc
+++ b/playerradio.cc
@@ -65,7 +65,7 @@ int PlayerRadio::init(ULLONG tlengthBytes, ULONG tlengthPackets)
   demuxer = new DemuxerVDR();
   if (!demuxer) return 0;
 
-  if (!demuxer->init(this, audio, NULL, 10, 40000))
+  if (!demuxer->init(this, audio, NULL, 0, 40000))
   {
     logger->log("PlayerRadio", Log::ERR, "Demuxer failed to init");
     shutdown();

diff --git a/playerradio.h b/playerradio.h
index 26f204da42fb845614d7a5d858126c7dfefa66b3..67e5e4cf6a5b966b31f32cfaf9c87bde8d4c3041 100644 (file)
--- a/playerradio.h
+++ b/playerradio.h
@@ -49,7 +49,7 @@ class PlayerRadio : public Thread_TYPE, public Callback
     PlayerRadio(MessageQueue* messageQueue, void* messageReceiver, bool isRecording);
     virtual ~PlayerRadio();
 
-    int init(ULLONG lengthBytes, ULONG lengthFrames);
+    int init(ULLONG lengthBytes, ULONG lengthPackets);
     int shutdown();
     void setStartBytes(ULLONG startBytes);
 
@@ -82,14 +82,14 @@ class PlayerRadio : public Thread_TYPE, public Callback
     void threadPostStopCleanup();
 
   private:
-    void switchState(UCHAR newState, ULONG jumpFrame=0);
+    void switchState(UCHAR newState, ULONG jumpPacket=0);
 
     void threadFeedLive();
     void threadFeedPlay();
     void threadFeedScan();
 
     void doConnectionLost();
-    void restartAtFrame(ULONG newFrame);
+    void restartAtPacket(ULONG newPacket);
 
     MessageQueue* messageQueue;
     void* messageReceiver;
@@ -117,8 +117,8 @@ class PlayerRadio : public Thread_TYPE, public Callback
 
     ULLONG lengthBytes;
     ULLONG streamPos;
-    ULONG lengthFrames;
-    ULONG currentFrameNumber;
+    ULONG lengthPackets;
+    ULONG currentPacketNumber;
     UINT blockSize;
     UINT startupBlockSize;
     UINT preBufferSize;

diff --git a/vrecordinglist.cc b/vrecordinglist.cc
index 5be3e472a1da0ae193427c188e2ece366a7a7273..8aa39f7cc00e553f8e350288cd0b5b4f27427224 100644 (file)
--- a/vrecordinglist.cc
+++ b/vrecordinglist.cc
@@ -297,22 +297,22 @@ int VRecordingList::doPlay(bool resume)
   if (toPlay)
   {
     toPlay->loadRecInfo();
-//    if (toPlay->recInfo->hasVideo())
-//    {
+    if (toPlay->recInfo->hasNoVideo())
+    {
+      VRadioRec* radrec = new VRadioRec(toPlay);
+      radrec->draw();
+      viewman->add(radrec);
+      viewman->updateView(radrec);
+      radrec->go();
+    }
+    else
+    {
       VVideoRec* vidrec = new VVideoRec(toPlay);
       vidrec->draw();
       viewman->add(vidrec);
       viewman->updateView(vidrec);
       vidrec->go(resume);
-//    }
-//    else
-//    {
-//      VRadioRec* radrec = new VRadioRec(toPlay);
-//      radrec->draw();
-//      viewman->add(radrec);
-//      viewman->updateView(radrec);
-//      radrec->go();
-//    }
+    }
     return 1;
   }
   // should not get to here