From 057ab40acd37de4dd92253f4643792fc1d8cad50 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Wed, 20 Jul 2005 00:02:02 +0000
Subject: [PATCH] NTSC support, needs testing

---
 Makefile                                  |   1 +
 command.cc                                |  33 +++++++++++++++++++---
 command.h                                 |   1 +
 defines.h                                 |   4 +--
 main.cc                                   |   7 +++--
 osd.cc                                    |   8 +++++-
 osd.h                                     |   9 ++++--
 other/wallpaperNTSC.jpg                   | Bin 0 -> 23284 bytes
 other/{wallpaper.jpg => wallpaperPAL.jpg} | Bin
 tcp.cc                                    |   6 ++--
 vchannellist.cc                           |  10 ++++++-
 vlivebanner.cc                            |  10 ++++++-
 vlivebanner.h                             |   1 +
 vmute.cc                                  |  10 ++++++-
 vmute.h                                   |   1 +
 vrecordinglist.cc                         |  10 ++++++-
 vrecordingmenu.cc                         |  28 ++++++++++++++++--
 vrecordingmenu.h                          |   1 +
 vserverselect.cc                          |   9 +++++-
 vserverselect.h                           |   1 +
 vvideolive.cc                             |   2 +-
 vvideolive.h                              |   1 +
 vvideorec.cc                              |   2 +-
 vvideorec.h                               |   1 +
 vvolume.cc                                |  16 ++++++++---
 vvolume.h                                 |   1 +
 vwelcome.cc                               |  19 +++++++++++--
 vwelcome.h                                |   1 +
 28 files changed, 164 insertions(+), 29 deletions(-)
 create mode 100644 other/wallpaperNTSC.jpg
 rename other/{wallpaper.jpg => wallpaperPAL.jpg} (100%)

diff --git a/Makefile b/Makefile
index 21f0214..e58d89f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 CC = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-g++
 STRIP = /opt/crosstool/powerpc-405-linux-gnu/gcc-2.95.3-glibc-2.2.5/bin/powerpc-405-linux-gnu-strip
+
 CXX = $(CC)
 INCLUDES = -I../jpeg-6b
 CXXFLAGS = -Wall -Woverloaded-virtual -Werror $(INCLUDES)
diff --git a/command.cc b/command.cc
index fe7bd6c..7c4285d 100644
--- a/command.cc
+++ b/command.cc
@@ -78,6 +78,8 @@ void Command::run()
 
   mainPid = getpid();
 
+  UCHAR screenSize = Osd::getInstance()->getScreenSize();
+
   // moved from startup because surface delete doesn't work
 
   // just in case
@@ -86,7 +88,7 @@ void Command::run()
 
   // Blue background
   View* v = new View();
-  v->setDimensions(SCREENHEIGHT, SCREENWIDTH);
+  v->setDimensions(Osd::getInstance()->getScreenHeight(), Osd::getInstance()->getScreenWidth());
   v->setBackgroundColour(Colour::VIDEOBLUE);
   v->draw();
   v->show();
@@ -95,7 +97,16 @@ void Command::run()
 
   // Wallpaper
   VWallpaper* w = new VWallpaper();
-  w->init("/wallpaper.jpg");
+  if (screenSize == Osd::PAL)
+  {
+    Log::getInstance()->log("Command", Log::DEBUG, "PAL wallpaper selected");
+    w->init("/wallpaperPAL.jpg");
+  }
+  else
+  {
+    Log::getInstance()->log("Command", Log::DEBUG, "NTSC wallpaper selected");
+    w->init("/wallpaperNTSC.jpg");
+  }
   w->draw();
   w->show();
   viewman->add(w);
@@ -276,7 +287,14 @@ void Command::broadcastForServers()
 {
   VInfo* viewWait = new VInfo();
   viewWait->setDimensions(200, 400);
-  viewWait->setScreenPos(170, 200);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    viewWait->setScreenPos(170, 200);
+  }
+  else
+  {
+    viewWait->setScreenPos(160, 150);
+  }
   viewWait->setMainText("\n                        Locating server");
   viewWait->draw();
   viewWait->show();
@@ -301,7 +319,14 @@ int Command::connectToServer(int vectorIndex)
 
   VInfo* viewWait = new VInfo();
   viewWait->setDimensions(200, 400);
-  viewWait->setScreenPos(170, 200);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    viewWait->setScreenPos(170, 200);
+  }
+  else
+  {
+    viewWait->setScreenPos(160, 150);
+  }
   viewWait->setMainText("\n                     Connecting to VDR");
   viewWait->draw();
   viewWait->show();
diff --git a/command.h b/command.h
index c7a0b56..8e907f6 100644
--- a/command.h
+++ b/command.h
@@ -49,6 +49,7 @@
 #include "vwelcome.h"
 #include "vmute.h"
 #include "colour.h"
+#include "osd.h"
 
 class Command : public MessageQueue
 {
diff --git a/defines.h b/defines.h
index 9d750fb..0d6f880 100644
--- a/defines.h
+++ b/defines.h
@@ -31,8 +31,8 @@ typedef unsigned long long ULLONG;
 //#define SCREENHEIGHT 576
 //#define SCREENHEIGHT 480
 
-extern int SCREENWIDTH;
-extern int SCREENHEIGHT;
+//extern int SCREENWIDTH;
+//extern int SCREENHEIGHT;
 
 ULLONG htonll(ULLONG a);
 ULLONG ntohll(ULLONG a);
diff --git a/main.cc b/main.cc
index 57625f3..4bd36b6 100644
--- a/main.cc
+++ b/main.cc
@@ -212,10 +212,13 @@ int main(int argc, char** argv)
     videoFormat = Video::NTSC;
     videoConnection = Video::COMPOSITE;
     logger->log("Core", Log::INFO, "MTD gave us no help. Guessing NTSC.");
-
   }
 
-  success = osd->init("/dev/stbgfx", SCREENHEIGHT, SCREENWIDTH, 1);
+  // temp hack - simulate ntsc on pal
+//  SCREENHEIGHT = 480;
+//  videoFormat = Video::NTSC;
+
+  success = osd->init("/dev/stbgfx", SCREENHEIGHT, SCREENWIDTH, videoFormat, 1);
   if (success)
   {
     logger->log("Core", Log::INFO, "OSD module initialised");
diff --git a/osd.cc b/osd.cc
index d325301..5040dbf 100644
--- a/osd.cc
+++ b/osd.cc
@@ -60,7 +60,12 @@ int Osd::getScreenWidth()
   return width;
 }
 
-int Osd::init(char* device, int height, int width, int doubleBuffering)
+int Osd::getScreenSize()
+{
+  return screenSize;
+}
+
+int Osd::init(char* device, int height, int width, UCHAR tscreenSize, int doubleBuffering)
 {
   if (initted) return 0;
 
@@ -75,6 +80,7 @@ int Osd::init(char* device, int height, int width, int doubleBuffering)
 
   this->height = height;
   this->width = width;
+  screenSize = tscreenSize;
 
   Surface::initConversionTables();
 
diff --git a/osd.h b/osd.h
index 1c11504..04cc8a0 100644
--- a/osd.h
+++ b/osd.h
@@ -36,15 +36,20 @@ class Osd
     ~Osd();
     static Osd* getInstance();
 
-    int init(char* device, int height, int width, int doubleBuffering);
+    int init(char* device, int height, int width, UCHAR tscreenSize, int doubleBuffering);
     int shutdown();
 
     int getFD();
     int getScreenHeight();
     int getScreenWidth();
+    int getScreenSize();
 
     void screenShot(char* fileName);
 
+    // Video formats - AV_SET_VID_DISP_FMT  // here, video, everywhere!
+    const static UCHAR NTSC = 0;
+    const static UCHAR PAL = 1;
+
   private:
     static Osd* instance;
     int initted;
@@ -55,7 +60,7 @@ class Osd
     int fdOsd;
     int width;
     int height;
-
+    UCHAR screenSize;
 };
 
 #endif
diff --git a/other/wallpaperNTSC.jpg b/other/wallpaperNTSC.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5df6cbe6340b61f29aad87b12efe9215197112a8
GIT binary patch
literal 23284
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
X1)%iPH2>n?{HT8T|M*%JKD_uBiqHT9

literal 0
HcmV?d00001

diff --git a/other/wallpaper.jpg b/other/wallpaperPAL.jpg
similarity index 100%
rename from other/wallpaper.jpg
rename to other/wallpaperPAL.jpg
diff --git a/tcp.cc b/tcp.cc
index ef78c96..0546d6d 100644
--- a/tcp.cc
+++ b/tcp.cc
@@ -144,12 +144,14 @@ int TCP::isConnected()
   return connected;
 }
 
-int TCP::sendPacket(void* buf, size_t count)
+int TCP::sendPacket(void* bufR, size_t count)
 {
   size_t bytes_sent = 0;
   int this_write;
   int temp_write;
 
+  unsigned char* buf = (unsigned char*)bufR;
+
   while (bytes_sent < count)
   {
     do
@@ -164,7 +166,7 @@ int TCP::sendPacket(void* buf, size_t count)
       return(this_write);
     }
     bytes_sent += this_write;
-    (unsigned char*)buf += this_write;
+    buf += this_write;
   }
   return(count);
 }
diff --git a/vchannellist.cc b/vchannellist.cc
index 67291f5..3550e14 100644
--- a/vchannellist.cc
+++ b/vchannellist.cc
@@ -22,7 +22,15 @@
 
 VChannelList::VChannelList(ULONG type)
 {
-  setScreenPos(80, 70);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(80, 70);
+  }
+  else
+  {
+    setScreenPos(70, 35);
+  }
+
   setDimensions(420, 570);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
diff --git a/vlivebanner.cc b/vlivebanner.cc
index 871001d..b50ca90 100644
--- a/vlivebanner.cc
+++ b/vlivebanner.cc
@@ -22,7 +22,15 @@
 
 VLiveBanner::VLiveBanner()
 {
-  setScreenPos(130, 370);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(130, 370);
+  }
+  else
+  {
+    setScreenPos(120, 320);
+  }
+
   setDimensions(120, 500);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
diff --git a/vlivebanner.h b/vlivebanner.h
index b0701db..9055589 100644
--- a/vlivebanner.h
+++ b/vlivebanner.h
@@ -29,6 +29,7 @@
 #include "vdr.h"
 #include "wselectlist.h"
 #include "colour.h"
+#include "osd.h"
 
 class VLiveBanner : public View
 {
diff --git a/vmute.cc b/vmute.cc
index 3adc881..4233a9e 100644
--- a/vmute.cc
+++ b/vmute.cc
@@ -24,8 +24,16 @@ VMute::VMute()
 {
   isMuted = Audio::getInstance()->toggleUserMute();
 
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(600, 500);
+  }
+  else
+  {
+    setScreenPos(590, 400);
+  }
+
   setDimensions(40, 40);
-  setScreenPos(600, 500);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
 }
diff --git a/vmute.h b/vmute.h
index 60ef05e..c89d324 100644
--- a/vmute.h
+++ b/vmute.h
@@ -28,6 +28,7 @@
 #include "audio.h"
 #include "wsymbol.h"
 #include "colour.h"
+#include "osd.h"
 
 class VMute : public View
 {
diff --git a/vrecordinglist.cc b/vrecordinglist.cc
index 05d82a9..6eb572d 100644
--- a/vrecordinglist.cc
+++ b/vrecordinglist.cc
@@ -22,7 +22,15 @@
 
 VRecordingList::VRecordingList()
 {
-  setScreenPos(80, 70);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(80, 70);
+  }
+  else
+  {
+    setScreenPos(70, 35);
+  }
+
   setDimensions(420, 570);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
diff --git a/vrecordingmenu.cc b/vrecordingmenu.cc
index 8e1d703..63c402e 100644
--- a/vrecordingmenu.cc
+++ b/vrecordingmenu.cc
@@ -24,7 +24,15 @@ VRecordingMenu::VRecordingMenu()
 {
   rec = NULL;
 
-  setScreenPos(260, 190);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(260, 190);
+  }
+  else
+  {
+    setScreenPos(250, 160);
+  }
+
   setDimensions(140, 200);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
@@ -109,7 +117,14 @@ int VRecordingMenu::handleCommand(int command)
       vi->setExitable();
       if (summary) vi->setMainText(summary);
       else vi->setMainText("Summary unavailable");
-      vi->setScreenPos(120, 130);
+      if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+      {
+        vi->setScreenPos(120, 130);
+      }
+      else
+      {
+        vi->setScreenPos(110, 90);
+      }
       vi->setDimensions(300, 490);
 
       ViewMan::getInstance()->addNoLock(vi);
@@ -131,7 +146,14 @@ int VRecordingMenu::handleCommand(int command)
       v->setTitleText("Delete recording");
       v->setMainText("Are you sure you want to delete this recording?");
       v->setDefault(VQuestion::NO);
-      v->setScreenPos(230, 160);
+      if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+      {
+        v->setScreenPos(230, 160);
+      }
+      else
+      {
+        v->setScreenPos(220, 140);
+      }
       v->setDimensions(180, 260);
 
       ViewMan::getInstance()->addNoLock(v);
diff --git a/vrecordingmenu.h b/vrecordingmenu.h
index b21bd5a..816b1da 100644
--- a/vrecordingmenu.h
+++ b/vrecordingmenu.h
@@ -34,6 +34,7 @@
 #include "vinfo.h"
 #include "vdr.h"
 #include "colour.h"
+#include "osd.h"
 
 class VRecordingList;
 
diff --git a/vserverselect.cc b/vserverselect.cc
index 0953541..ddc140a 100644
--- a/vserverselect.cc
+++ b/vserverselect.cc
@@ -28,8 +28,15 @@ VServerSelect::VServerSelect(std::vector<char*>* serverIPs, int* tselectServer)
   // anyway, now it doesn't use a object wide reference.
   selectServer = tselectServer;
 
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(220, 200);
+  }
+  else
+  {
+    setScreenPos(210, 150);
+  }
   setDimensions(200, 300);
-  setScreenPos(220, 200);
   setBackgroundColour(Colour::VIEWBACKGROUND);
   setTitleBarOn(1);
   setTitleBarColour(Colour::TITLEBARBACKGROUND);
diff --git a/vserverselect.h b/vserverselect.h
index 6655360..423b3bb 100644
--- a/vserverselect.h
+++ b/vserverselect.h
@@ -30,6 +30,7 @@
 #include "remote.h"
 #include "wselectlist.h"
 #include "colour.h"
+#include "osd.h"
 
 class VServerSelect : public View
 {
diff --git a/vvideolive.cc b/vvideolive.cc
index 25b672f..431c48d 100644
--- a/vvideolive.cc
+++ b/vvideolive.cc
@@ -28,7 +28,7 @@ VVideoLive::VVideoLive(List* tchanList)
   chanList = tchanList;
   currentChannel = 0;
 
-  setDimensions(SCREENHEIGHT, SCREENWIDTH);
+  setDimensions(Osd::getInstance()->getScreenHeight(), Osd::getInstance()->getScreenWidth());
   Colour transparent(0, 0, 0, 0);
   setBackgroundColour(transparent);
 }
diff --git a/vvideolive.h b/vvideolive.h
index 838d805..925650d 100644
--- a/vvideolive.h
+++ b/vvideolive.h
@@ -32,6 +32,7 @@
 #include "viewman.h"
 #include "vchannelselect.h"
 #include "colour.h"
+#include "osd.h"
 
 class VVideoLive : public View
 {
diff --git a/vvideorec.cc b/vvideorec.cc
index 793e481..70707e9 100644
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -28,7 +28,7 @@ VVideoRec::VVideoRec(Recording* rec)
 
   myRec = rec;
 
-  setDimensions(SCREENHEIGHT, SCREENWIDTH);
+  setDimensions(Osd::getInstance()->getScreenHeight(), Osd::getInstance()->getScreenWidth());
   Colour transparent(0, 0, 0, 0);
   setBackgroundColour(transparent);
 }
diff --git a/vvideorec.h b/vvideorec.h
index 872a18e..c1d2632 100644
--- a/vvideorec.h
+++ b/vvideorec.h
@@ -29,6 +29,7 @@
 #include "recording.h"
 #include "command.h"
 #include "colour.h"
+#include "osd.h"
 
 class VVideoRec : public View
 {
diff --git a/vvolume.cc b/vvolume.cc
index 348bf27..6408dc5 100644
--- a/vvolume.cc
+++ b/vvolume.cc
@@ -24,8 +24,16 @@ VVolume::VVolume()
 {
   displayVolume = Audio::getInstance()->getVolume();
 
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(100, 499);
+  }
+  else
+  {
+    setScreenPos(90, 400);
+  }
+
   setDimensions(31, 227);
-  setScreenPos(100, 499);
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
 }
@@ -36,7 +44,7 @@ void VVolume::draw()
 
   WSymbol* w = new WSymbol;
   w->nextSymbol = WSymbol::VOLUME2;
-  w->setScreenPos(103, 509);
+  w->setScreenPos(screenX + 3, screenY + 10);
   w->draw();
 
   int i = 0;
@@ -44,14 +52,14 @@ void VVolume::draw()
   for(; i < displayVolume; i++)
   {
     w->nextSymbol = WSymbol::VOLBAR;
-    w->setScreenPos(140 + (i * 9), 502);
+    w->setScreenPos(screenX + 40 + (i * 9), screenY + 3);
     w->draw();
   }
 
   for(; i < 20; i++)
   {
     w->nextSymbol = WSymbol::VOLDOT;
-    w->setScreenPos(140 + (i * 9), 512);
+    w->setScreenPos(screenX + 40 + (i * 9), screenY + 13);
     w->draw();
   }
 
diff --git a/vvolume.h b/vvolume.h
index 068f483..380dca4 100644
--- a/vvolume.h
+++ b/vvolume.h
@@ -28,6 +28,7 @@
 #include "audio.h"
 #include "wsymbol.h"
 #include "colour.h"
+#include "osd.h"
 
 class VVolume : public View
 {
diff --git a/vwelcome.cc b/vwelcome.cc
index 2a950b6..1cd1031 100644
--- a/vwelcome.cc
+++ b/vwelcome.cc
@@ -23,7 +23,15 @@
 VWelcome::VWelcome()
 {
   setDimensions(190, 460);
-  setScreenPos(140, 170);
+
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    setScreenPos(140, 170);
+  }
+  else
+  {
+    setScreenPos(130, 140);
+  }
 
   setBackgroundColour(Colour::VIEWBACKGROUND);
   setTitleBarOn(1);
@@ -185,7 +193,14 @@ void VWelcome::doRecordingsList()
 
   VInfo* viewWait = new VInfo();
   viewWait->setDimensions(190, 460);
-  viewWait->setScreenPos(140, 170);
+  if (Osd::getInstance()->getScreenSize() == Osd::PAL)
+  {
+    viewWait->setScreenPos(140, 170);
+  }
+  else
+  {
+    viewWait->setScreenPos(130, 140);
+  }
   viewWait->setMainText("\n                  Downloading recordings list");
   viewWait->draw();
   viewWait->show();
diff --git a/vwelcome.h b/vwelcome.h
index 86ed434..417a169 100644
--- a/vwelcome.h
+++ b/vwelcome.h
@@ -36,6 +36,7 @@
 #include "command.h"
 #include "message.h"
 #include "colour.h"
+#include "osd.h"
 
 class VWelcome : public View
 {
-- 
2.39.2