Fix for displaying radio EPG

diff --git a/vepg.cc b/vepg.cc
index 85a30aa9cb33ca1e77a1e47463fc9fb343165388..06859ee17abc8edd996297381bbf12c66ffff319 100644 (file)
--- a/vepg.cc
+++ b/vepg.cc
@@ -35,7 +35,7 @@
 
 VEpg* VEpg::instance = NULL;
 
-VEpg::VEpg(VVideoLive* v, UINT currentChannel)
+VEpg::VEpg(VVideoLive* v, UINT currentChannel, ULONG streamType)
 {
   instance = this;
 
@@ -74,7 +74,7 @@ VEpg::VEpg(VVideoLive* v, UINT currentChannel)
   viewman = ViewMan::getInstance();
   videoLive = v;
   eventList = NULL;
-  chanList = VDR::getInstance()->getChannelsList(VDR::VIDEO); //TODO want to be able to display video and radio together
+  chanList = VDR::getInstance()->getChannelsList(streamType); //TODO want to be able to display video and radio together
   e = 0;
 
   for(UINT listIndex = 0; listIndex < gridRows; listIndex++)

diff --git a/vepg.h b/vepg.h
index a856b405af8f63ac27a5bf9fa3104c11780f8a4a..04aa1d604c1b7b9abd62473a07edc0f53528fe48 100644 (file)
--- a/vepg.h
+++ b/vepg.h
@@ -47,7 +47,7 @@ class VVideoLive;
 class VEpg : public View, public TimerReceiver
 {
   public:
-    VEpg(VVideoLive* v, UINT currentChannel = 0);
+    VEpg(VVideoLive* v, UINT currentChannel, ULONG streamType);
     ~VEpg();
     static VEpg* getInstance();
 

diff --git a/vradiorec.cc b/vradiorec.cc
index f630f93b3a48ffe0d05b0fa4d84422e91e153b48..6c6630362a3b6f4d29b58b85b2ff1aa844d5eb7b 100644 (file)
--- a/vradiorec.cc
+++ b/vradiorec.cc
@@ -219,17 +219,6 @@ int VRadioRec::handleCommand(int command)
     {
       //player->test1();
 
-
-      /*
-      // for testing EPG in NTSC with a NTSC test video
-      Video::getInstance()->setMode(Video::QUARTER);
-      Video::getInstance()->setPosition(170, 5);
-      VEpg* vepg = new VEpg(NULL, 0);
-      vepg->draw();
-      ViewMan::getInstance()->add(vepg);
-      ViewMan::getInstance()->updateView(vepg);
-      */
-
       return 2;
     }
     case Remote::GREEN:

diff --git a/vvideolive.cc b/vvideolive.cc
index aed193151e83b6d4c22246e99170f7292226d94d..32611152c0dd3d0ffe787b9a403817140d926781 100644 (file)
--- a/vvideolive.cc
+++ b/vvideolive.cc
@@ -459,7 +459,7 @@ void VVideoLive::showEPG()
   video->setMode(Video::QUARTER);
   video->setPosition(170, 5); //TODO need to deal with 4:3 switching
 
-  VEpg* vepg = new VEpg(this, currentChannel);
+  VEpg* vepg = new VEpg(this, currentChannel, streamType);
   vepg->draw();
 
   viewman->add(vepg);