Some mvpcompile fixes

diff --git a/surface.h b/surface.h
index 9d5aad6ed8b6a6598f0184066a8633296b6db62c..3399fea006ca7bdeadee3a6c86683d3a744efdf1 100644 (file)
--- a/surface.h
+++ b/surface.h
@@ -48,7 +48,8 @@ class Bitmap;
 \r
 class Surface\r
 {\r
-  friend class Wwss;\r
+  friend class Wwss; // classes that need surface access, their usage is forbidden for vector based\r
+  friend class WJpegComplex;// implementations of osd\r
   public:\r
     Surface(int id = 0);\r
     virtual ~Surface();\r

diff --git a/vmediaview.cc b/vmediaview.cc
index 0e9f274a515c9accd38935265412e78998169f38..521f7afdf066b110884da723fb9c6fe50e6f7989 100644 (file)
--- a/vmediaview.cc
+++ b/vmediaview.cc
@@ -172,7 +172,7 @@ class DrawingThread : public Thread_TYPE {
   private:\r
     VMediaView *_parent;\r
     VPreader * _reader;\r
-    WJpeg::JpegControl *_ctl;\r
+    WJpegComplex::JpegControl *_ctl;\r
     Surface *_sfc;\r
     Colour _colour;\r
     bool _interrupted;\r
@@ -263,7 +263,7 @@ VMediaView::VMediaView(VMediaList *p)
 \r
   //picture settings\r
   showtime=INITIAL_SHOWTIME;\r
-  rotate=WJpeg::ROT_0;\r
+  rotate=WJpegComplex::ROT_0;\r
   currentScale=1;\r
   options=MediaOptions::getInstance();\r
   VColourTuner::initFactors();\r
@@ -274,9 +274,9 @@ VMediaView::VMediaView(VMediaList *p)
   ctl.enlarge=false;\r
   ctl.scaleafter=options->getIntOption("ScaleFactor");\r
   const char * mode=options->getStringOption("PictureMode");\r
-  if (strcmp(mode,"clip") == 0) ctl.mode=WJpeg::CROP;\r
-  else if (strcmp(mode,"letter") == 0) ctl.mode=WJpeg::LETTER;\r
-  else if (strcmp(mode,"clipfactor") == 0) ctl.mode=WJpeg::CROPPERCENT;\r
+  if (strcmp(mode,"clip") == 0) ctl.mode=WJpegComplex::CROP;\r
+  else if (strcmp(mode,"letter") == 0) ctl.mode=WJpegComplex::LETTER;\r
+  else if (strcmp(mode,"clipfactor") == 0) ctl.mode=WJpegComplex::CROPPERCENT;\r
   ctl.scaleAmount=options->getIntOption("PictureSize");\r
   if (ctl.scaleAmount < 10) ctl.scaleAmount=10;\r
   if (ctl.scaleAmount > 200) ctl.scaleAmount=200;\r
@@ -448,7 +448,7 @@ int VMediaView::handleCommand(int command)
       case Remote::DF_UP:\r
       case Remote::UP:\r
       case Remote::SKIPBACK:\r
-        rotate=WJpeg::ROT_0;\r
+        rotate=WJpegCmplex::ROT_0;\r
         showPicture(VMediaList::MV_PREV,slideshow,true);\r
         rt= 2;\r
         break;\r
@@ -459,7 +459,7 @@ int VMediaView::handleCommand(int command)
       case Remote::DF_DOWN:\r
       case Remote::DOWN:\r
       case Remote::SKIPFORWARD:\r
-        rotate=WJpeg::ROT_0;\r
+        rotate=WJpegComplex::ROT_0;\r
         showPicture(VMediaList::MV_NEXT,slideshow,true);\r
         rt= 2;\r
         break;\r
@@ -484,7 +484,7 @@ int VMediaView::handleCommand(int command)
       case Remote::PLAY:\r
       {\r
         slideshow=true;\r
-        rotate=WJpeg::ROT_0;\r
+        rotate=WJpegComplex::ROT_0;\r
         showPicture(VMediaList::MV_NEXT,slideshow,true);\r
         rt= 2;\r
       }\r
@@ -496,7 +496,7 @@ int VMediaView::handleCommand(int command)
         }\r
         else {\r
           slideshow=true;\r
-          rotate=WJpeg::ROT_0;\r
+          rotate=WJpegComplex::ROT_0;\r
           showPicture(VMediaList::MV_NEXT,slideshow,true);\r
         }\r
         rt= 2;\r
@@ -509,17 +509,17 @@ int VMediaView::handleCommand(int command)
         break;\r
       case Remote::RED:\r
         switch(rotate) {\r
-          case WJpeg::ROT_0:\r
+          case WJpegComplex::ROT_0:\r
             rotate=WJpeg::ROT_90;\r
             break;\r
-          case WJpeg::ROT_90:\r
-            rotate=WJpeg::ROT_180;\r
+          case WJpegComplex::ROT_90:\r
+            rotate=WJpegComplex::ROT_180;\r
             break;\r
-          case WJpeg::ROT_180:\r
-            rotate=WJpeg::ROT_270;\r
+          case WJpegComplex::ROT_180:\r
+            rotate=WJpegComplex::ROT_270;\r
             break;\r
-          case WJpeg::ROT_270:\r
-            rotate=WJpeg::ROT_0;\r
+          case WJpegComplex::ROT_270:\r
+            rotate=WJpegComplex::ROT_0;\r
             break;\r
           }\r
         showPicture(VMediaList::MV_NONE,slideshow,true);\r
@@ -532,14 +532,14 @@ int VMediaView::handleCommand(int command)
         break;\r
       case Remote::BLUE:\r
         switch (cropmode) {\r
-          case WJpeg::CROP:\r
+          case WJpegComplex::CROP:\r
             cropmode=WJpeg::LETTER;\r
             break;\r
-          case WJpeg::LETTER:\r
+          case WJpegComplex::LETTER:\r
             cropmode=WJpeg::CROPPERCENT;\r
             break;\r
           default:\r
-            cropmode=WJpeg::CROP;\r
+            cropmode=WJpegComplex::CROP;\r
             break;\r
         }\r
         showPicture(VMediaList::MV_NONE,slideshow,true);\r
@@ -725,7 +725,7 @@ void VMediaView::processMessage(Message* m)
         //if (! audioEnabled) {\r
         if (true) {\r
           if (slideshow) {\r
-            rotate=WJpeg::ROT_0;\r
+            rotate=WJpegComplex::ROT_0;\r
             showPicture(VMediaList::MV_NEXT,true,false);\r
             startSlideshow();\r
           }\r
@@ -859,7 +859,7 @@ int VMediaView::loadPicture(Media *md,bool activateBanner) {
      //now we can really draw\r
      //get the surface for drawing\r
      Surface * drawSurface=NULL;\r
-     WJpeg::JpegControl *drawCtl=NULL;\r
+     WJpegComplex::JpegControl *drawCtl=NULL;\r
      getDrawingParam(drawSurface,drawCtl);\r
      drawCtl->error[0]=0;\r
      drawCtl->rotation=rotate;\r
@@ -877,7 +877,7 @@ int VMediaView::loadPicture(Media *md,bool activateBanner) {
      return 0;\r
 #else\r
      //here we could hand this over to the drawing thread\r
-     bool ok=WJpeg::drawJpeg(drawCtl,drawSurface,reader,pictureBack);\r
+     bool ok=WJpegComplex::drawJpeg(drawCtl,drawSurface,reader,pictureBack);\r
      drawingDone(!ok);\r
      return ok?0:1;\r
 #endif\r
@@ -1026,10 +1026,10 @@ void VMediaView::showPictureInfo(){
   //modes should come from mediaoptions...\r
   const char *mode=NULL;\r
   switch (currentControl->mode) {\r
-    case WJpeg::CROPPERCENT:\r
+    case WJpegComplex::CROPPERCENT:\r
       mode="clipfactor";\r
       break;\r
-    case WJpeg::LETTER:\r
+    case WJpegComplex::LETTER:\r
       mode="letter";\r
       break;\r
     default:\r
@@ -1102,7 +1102,7 @@ void VMediaView::enableBanner(bool enable) {
   updatePictureBanner();\r
 }\r
 \r
-void VMediaView::getDrawingParam(Surface *&sfc,WJpeg::JpegControl *&c){\r
+void VMediaView::getDrawingParam(Surface *&sfc,WJpegComplex::JpegControl *&c){\r
   if (secondSurface()) {\r
     //we currently display on sfc2\r
     sfc=sfc1;\r

diff --git a/vmediaview.h b/vmediaview.h
index 14073e4e04ff466c89a5c899ceab0120dc46e5c8..5ed240db3dbc3fd28440d2a3d7b9613a4f29ae1c 100644 (file)
--- a/vmediaview.h
+++ b/vmediaview.h
@@ -51,7 +51,7 @@ class VMediaView : public Boxx, public TimerReceiver
 {
   friend class VPReader;
   public:
-    ~VMediaView();
+    virtual ~VMediaView();
 
     void processMessage(Message* m);
     int handleCommand(int command);
@@ -117,7 +117,7 @@ class VMediaView : public Boxx, public TimerReceiver
     void updatePictureInfo();
     void destroyInfo(bool fromTimer=false);
     int  loadPicture(Media *m,bool forceBanner);
-    void getDrawingParam(Surface *&sfc,WJpeg::JpegControl *&ctl);
+    void getDrawingParam(Surface *&sfc,WJpegComplex::JpegControl *&ctl);
     void switchSurface(); //will switch surface and currentControl
     void drawingDone(bool hasError);
 
@@ -133,17 +133,17 @@ class VMediaView : public Boxx, public TimerReceiver
     const char * pictureError;
     Media * currentPicture;
     const static int INITIAL_SHOWTIME=5;
-    WJpeg::Rotation rotate;
-    WJpeg::ScaleMode cropmode;
+    WJpegComplex::Rotation rotate;
+    WJpegComplex::ScaleMode cropmode;
     VInfo * info;
     static Colour pictureBack;
     static Colour infoBack;
     static Colour audioBannerBack;
     int currentScale;
     MediaOptions *options;
-    WJpeg::JpegControl ctl;
-    WJpeg::JpegControl ctl2;
-    WJpeg::JpegControl *currentControl;
+    WJpegComplex::JpegControl ctl;
+    WJpegComplex::JpegControl ctl2;
+    WJpegComplex::JpegControl *currentControl;
     Surface *sfc1;
     Surface *sfc2;
     //which is the active surface