Radio detection fix

diff --git a/vvideorec.cc b/vvideorec.cc
index 9fde5dcf22206e1ad5ca3d8810ae0ac1f00c1632..09beac431cb5586a479c4f78830c2e4a0aa4dc1c 100644 (file)
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -28,11 +28,7 @@ VVideoRec::VVideoRec(Recording* rec)
   timers = Timers::getInstance();
   vas = NULL;
 
-  isRadio = rec->recInfo->hasNoVideo();
-
-  Log::getInstance()->log("VVideoRec", Log::DEBUG, "Radio = %i", isRadio);
-
-  player = new Player(Command::getInstance(), this, true, isRadio);
+  player = new Player(Command::getInstance(), this, true, false);
   player->init();
 
   videoMode = video->getMode();
@@ -152,16 +148,8 @@ void VVideoRec::go(bool resume)
   if (lengthBytes)
   {
     player->setLengthBytes(lengthBytes);
-    if (!isRadio)
-    {
-      Log::getInstance()->log("VVideoRec", Log::DEBUG, "GO is setting length frames = %lu", lengthFrames);
-      player->setLengthFrames(lengthFrames);
-    }
-    else
-    {
-      Log::getInstance()->log("VVideoRec", Log::DEBUG, "GO is NOT setting length frames");
-    }
-    player->setStartFrame(startFrameNum); // means bytes if radio (FIXME not done yet!)
+    player->setLengthFrames(lengthFrames);
+    player->setStartFrame(startFrameNum);
     player->play();
     playing = true;
     doBar(0);
@@ -240,14 +228,12 @@ int VVideoRec::handleCommand(int command)
     }
     case Remote::FORWARD:
     {
-      if (isRadio) return 2;
       player->fastForward();
       doBar(0);
       return 2;
     }
     case Remote::REVERSE:
     {
-      if (isRadio) return 2;
       player->fastBackward();
       doBar(0);
       return 2;
@@ -272,7 +258,6 @@ int VVideoRec::handleCommand(int command)
     case Remote::FULL:
     case Remote::TV:
     {
-      if (isRadio) return 2;
       toggleChopSides();
       return 2;
     }

diff --git a/vvideorec.h b/vvideorec.h
index b03a40f87b5712e0d972af846f268d54e8ae695e..3efb7c334ca433e59435046644ccfc3879adbb1e 100644 (file)
--- a/vvideorec.h
+++ b/vvideorec.h
@@ -71,7 +71,6 @@ class VVideoRec : public View, public TimerReceiver
     void toggleChopSides();
 
     bool playing;
-    bool isRadio;
 
     bool barShowing;
     bool barGenHold;