From 1db50a9de5fb0e1dde912f4129257839ede6c3d4 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Wed, 15 Aug 2007 20:51:51 +0000
Subject: [PATCH] Minor fixes

---
 player.cc        |  7 ++++---
 vremoteconfig.cc | 10 +++++-----
 vtabsviewman.cc  |  4 +++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/player.cc b/player.cc
index c0578af..8f2c076 100644
--- a/player.cc
+++ b/player.cc
@@ -467,6 +467,7 @@ void Player::switchState(UCHAR toState, ULONG jumpFrame)
         case S_JUMP: // to S_JUMP
         {
           state = S_PLAY;
+          audio->systemMuteOn();
           audio->unPause();
           restartAtFrame(jumpFrame);
           return;
@@ -671,7 +672,7 @@ void Player::switchState(UCHAR toState, ULONG jumpFrame)
           startup = true;
 
           audio->reset();
-					audio->setStreamType(Audio::MPEG2_PES);
+          audio->setStreamType(Audio::MPEG2_PES);
           audio->systemMuteOff();
           video->reset();
           demuxer->reset();
@@ -770,7 +771,7 @@ void Player::restartAtFrame(ULONG newFrame)
   video->stop();
   video->reset();
   audio->reset();
-	audio->setStreamType(Audio::MPEG2_PES);
+  audio->setStreamType(Audio::MPEG2_PES);
   demuxer->flush();
   demuxer->seek();
   currentFrameNumber = newFrame;
@@ -915,7 +916,7 @@ void Player::threadMethod()
       // if execution gets to here, threadFeedScan hit the start, go to play mode
       state = S_PLAY;
       audio->reset();
-	    audio->setStreamType(Audio::MPEG2_PES);
+      audio->setStreamType(Audio::MPEG2_PES);
       demuxer->flush();
       demuxer->seek();
       demuxer->setFrameNum(currentFrameNumber);
diff --git a/vremoteconfig.cc b/vremoteconfig.cc
index cb720e2..b8cb865 100644
--- a/vremoteconfig.cc
+++ b/vremoteconfig.cc
@@ -81,9 +81,9 @@ void VRemoteConfig::initSelectList(bool startup)
       if (name != NULL)
       {
           char *line = remote->CommandTranslateStr((UCHAR)i);
-          char * desc=new char [strlen(line)+1];
-          strcpy(desc,line);
-          sl.addOption(desc,i,0);
+      //    char * desc=new char [strlen(line)+1];    // CJT memory leak and unneccessary?
+      //    strcpy(desc,line);
+          sl.addOption(line,i,0);
       }
     }
     if (!startup)
@@ -99,8 +99,8 @@ void VRemoteConfig::draw()
   View::draw();
   
   drawText(tr("Command"), 15, 15, Colour::LIGHTTEXT);
-  drawText(tr("Hardwired"), 165, 15, Colour::LIGHTTEXT);
-  drawText(tr("Userassignable"), 315, 15, Colour::LIGHTTEXT);
+  drawText(tr("Hard wired"), 165, 15, Colour::LIGHTTEXT);
+  drawText(tr("User assignable"), 315, 15, Colour::LIGHTTEXT);
   sl.draw();
   if (learnmode)
   {
diff --git a/vtabsviewman.cc b/vtabsviewman.cc
index d9ad912..1ecbef1 100644
--- a/vtabsviewman.cc
+++ b/vtabsviewman.cc
@@ -249,7 +249,9 @@ int VTabsViewMan::handleCommand(int command)
           {
               views[selectedView]->handleCommand(command);
               draw();
-              viewman->updateView(this);
+           
+
+    //          viewman->updateView(this);   // CJT // this line makes it flash twice, unneccessary?
               return 2;
           }
           else
-- 
2.39.5