Minor fixes

diff --git a/player.cc b/player.cc
index c0578afd6ed18d465a4109253ecc3e1ca70b40a6..8f2c07618ea890f74336a08ffb74b16089b09494 100644 (file)
--- 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 cb720e23c57d470565ca9260460f49fdc55ea3bb..b8cb8655880f207a535fff534f69049ffefdd7f1 100644 (file)
--- 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 d9ad912c161d9cc2e7d4c5ea3b79df3134724388..1ecbef1826ee070a6f7c2faba817cf5b5aebab65 100644 (file)
--- 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