Live switching of letterbox/chop sides for 4:3 TVs

diff --git a/vvideolive.cc b/vvideolive.cc
index 74554f1765063dd9a40154c473a4771032ecd8cb..e7dabd69533013b86401d197fe00e1737ff412df 100644 (file)
--- a/vvideolive.cc
+++ b/vvideolive.cc
@@ -27,19 +27,19 @@ VVideoLive::VVideoLive(ChannelList* tchanList, ULONG tstreamType)
   instance = this;
   vdr = VDR::getInstance();
   viewman = ViewMan::getInstance();
+  video = Video::getInstance();
+
   chanList = tchanList;
   currentChannel = 0;
   previousChannel = 0;
   unavailable = 0;
   unavailableView = NULL;
   streamType = tstreamType;
-  videoMode = Video::getInstance()->getMode();
+  videoMode = video->getMode();
   if (streamType == VDR::RADIO) player = new PlayerVideo(Command::getInstance(), 0, 1);
   else                          player = new PlayerVideo(Command::getInstance(), 0, 0);
 
   player->init();
-
-  Video* video = Video::getInstance();
   create(video->getScreenWidth(), video->getScreenHeight());
   Colour transparent(0, 0, 0, 0);
   setBackgroundColour(transparent);
@@ -49,7 +49,7 @@ VVideoLive::~VVideoLive()
 {
   delete player;
   instance = NULL;
-  Video::getInstance()->setDefaultAspect();
+  video->setDefaultAspect();
 }
 
 VVideoLive* VVideoLive::getInstance()
@@ -126,6 +126,12 @@ int VVideoLive::handleCommand(int command)
       showEPG();
       return 2;
     }
+    case Remote::FULL:
+    case Remote::TV:
+    {
+      toggleChopSides();
+      return 2;
+    }
 
     case Remote::ZERO ... Remote::NINE:
     {
@@ -133,6 +139,7 @@ int VVideoLive::handleCommand(int command)
       v->draw();
       viewman->add(v);
       viewman->updateView(v);
+      return 2;
     }
   }
 
@@ -219,7 +226,7 @@ void VVideoLive::processMessage(Message* m)
   }
   else if (m->message == Message::EPG_CLOSE)
   {
-    Video::getInstance()->setMode(videoMode);
+    video->setMode(videoMode);
     if (saveUnavailable) showUnavailable(1);
   }
 }
@@ -253,7 +260,7 @@ void VVideoLive::showUnavailable(int active)
 
     unavailableView = new VInfo();
     unavailableView->create(400, 200);
-    if (Video::getInstance()->getFormat() == Video::PAL)
+    if (video->getFormat() == Video::PAL)
     {
       unavailableView->setScreenPos(170, 200);
     }
@@ -328,8 +335,8 @@ void VVideoLive::showEPG()
 
   if (VEpg::getInstance()) return; // already showing!
 
-  Video::getInstance()->setMode(Video::QUARTER);
-  Video::getInstance()->setPosition(170, 5); //TODO need to deal with 4:3 switching
+  video->setMode(Video::QUARTER);
+  video->setPosition(170, 5); //TODO need to deal with 4:3 switching
 
   VEpg* vepg = new VEpg(this, currentChannel);
   vepg->draw();
@@ -337,3 +344,19 @@ void VVideoLive::showEPG()
   viewman->add(vepg);
   viewman->updateView(vepg);
 }
+
+void VVideoLive::toggleChopSides()
+{
+  if (video->getTVsize() == Video::ASPECT16X9) return; // Means nothing for 16:9 TVs
+
+  if (videoMode == Video::NORMAL)
+  {
+    videoMode = Video::LETTERBOX;
+    video->setMode(Video::LETTERBOX);
+  }
+  else
+  {
+    videoMode = Video::NORMAL;
+    video->setMode(Video::NORMAL);
+  }
+}

diff --git a/vvideolive.h b/vvideolive.h
index 1cc8bb8e4c2656640f209c0a83e998a3c93fedb8..3757324c84344e6fa4f7179a8c65aadd32230bd3 100644 (file)
--- a/vvideolive.h
+++ b/vvideolive.h
@@ -74,6 +74,7 @@ class VVideoLive : public View
     static VVideoLive* instance;
     ViewMan* viewman;
     VDR* vdr;
+    Video* video;
     Player* player;
     ChannelList* chanList;
     UINT currentChannel;       // index in list
@@ -89,6 +90,7 @@ class VVideoLive : public View
     int xpos;
     void showEPG();
     void doNoSuchChannel();
+    void toggleChopSides();
     int videoMode;
     int saveUnavailable;
 };

diff --git a/vvideorec.cc b/vvideorec.cc
index 18e0c8a11561854df1bfccf12c26382ec7a288ab..b0d400f9e19f21beb80bc45fcb426c9ad1e68690 100644 (file)
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -25,10 +25,11 @@ VVideoRec::VVideoRec(Recording* rec)
   player = new PlayerVideo(Command::getInstance(), 1, 0); // say 0 for radio because buffering will work anyway
   player->init();
   vdr = VDR::getInstance();
+  video = Video::getInstance();
 
+  videoMode = video->getMode();
   myRec = rec;
 
-  Video* video = Video::getInstance();
   create(video->getScreenWidth(), video->getScreenHeight());
   Colour transparent(0, 0, 0, 0);
   setBackgroundColour(transparent);
@@ -106,6 +107,12 @@ int VVideoRec::handleCommand(int command)
       player->skipForward(10);
       return 2;
     }
+    case Remote::FULL:
+    case Remote::TV:
+    {
+      toggleChopSides();
+      return 2;
+    }
 
 //    case Remote::REVERSE:
 //    {
@@ -152,3 +159,19 @@ int VVideoRec::handleCommand(int command)
 
   return 1;
 }
+
+void VVideoRec::toggleChopSides()
+{
+  if (video->getTVsize() == Video::ASPECT16X9) return; // Means nothing for 16:9 TVs
+
+  if (videoMode == Video::NORMAL)
+  {
+    videoMode = Video::LETTERBOX;
+    video->setMode(Video::LETTERBOX);
+  }
+  else
+  {
+    videoMode = Video::NORMAL;
+    video->setMode(Video::NORMAL);
+  }
+}

diff --git a/vvideorec.h b/vvideorec.h
index cfaf2f5f79d9c1de6bb68afb4cac93f21cf4a225..b32e23c72d4c75c4ee3cb93523ec3b813a9fb44b 100644 (file)
--- a/vvideorec.h
+++ b/vvideorec.h
@@ -44,8 +44,12 @@ class VVideoRec : public View
 
   private:
     VDR* vdr;
+    Video* video;
     Player* player;
     Recording* myRec;
+
+    UCHAR videoMode;
+    void toggleChopSides();
 };
 
 #endif