diff trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc @ 400:dd13c9834ceb

- Well, most of  the graphics stuff at least compiles now. Next step is getting it running.

M    Modules/Output/Graphics/GraphicsView.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovieDirect.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovieDirect.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceCairo.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceCairo.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.h
M    Modules/Output/Graphics/Scale/ScaleLog.h
M    Modules/Output/Graphics/Scale/ScaleERB.h
M    Modules/Output/Graphics/Scale/ScaleLinear.h
M    Modules/Output/Graphics/Scale/ScaleLogScaled.h
M    Modules/Output/Graphics/Scale/Scale.cc
M    Modules/Output/Graphics/Scale/Scale.h
M    Support/Common.h

--- a/trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc	Sat Oct 16 22:27:03 2010 +0000
+++ b/trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc	Sat Oct 16 23:05:26 2010 +0000
@@ -46,8 +46,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.h"
 
-#include "Output/GraphicsOutputDeviceMovie.h"
+namespace aimc {
 
 GraphicsOutputDeviceMovie::GraphicsOutputDeviceMovie(Parameters *pParam)
   : GraphicsOutputDeviceCairo(pParam) {  // or GraphicsOutputDevicePlotutils
@@ -63,7 +64,7 @@
 
   // Check sound file exists
   if ((f = fopen(sSoundFile, "r")) == NULL) {
-    AIM_ERROR(_T("Couldn't open sound file '%s' for movie creation."),
+    LOG_ERROR(_T("Couldn't open sound file '%s' for movie creation."),
              sSoundFile);
     return false;
   }
@@ -72,7 +73,7 @@
 
   // Check movie output file can be made
   if ( (f=fopen(sMovieFile, "w"))==NULL ) {
-    aimERROR(_T("Couldn't open movie file '%s' to write to."),
+    LOG_ERROR(_T("Couldn't open movie file '%s' to write to."),
              sMovieFile);
     return false;
   }
@@ -96,7 +97,7 @@
   } else
 #endif
   {
-    AIM_ERROR(_T("Couldn't create a temporary directory for movie output."));
+    LOG_ERROR(_T("Couldn't create a temporary directory for movie output."));
     if (sTmpDir) free(sTmpDir);
     return false;
   }
@@ -165,7 +166,7 @@
     printf(sCmdLine);
     printf("\n");
   if (system(sCmdLine)) {
-    AIM_ERROR(_T("Couldn't create movie output."));
+    LOG_ERROR(_T("Couldn't create movie output."));
   }
 
 #ifdef __WX__
@@ -178,7 +179,7 @@
   WIN32_FIND_DATA FileData;
   snprintf(sCmdLine, sizeof(sCmdLine)/sizeof(sCmdLine[0]), "%s/*.*", m_sDir);
   if ((hList = FindFirstFile(sCmdLine, &FileData)) == INVALID_HANDLE_VALUE) {
-    AIM_ERROR(_T("Couldn't remove files from temporary directory."));
+    LOG_ERROR(_T("Couldn't remove files from temporary directory."));
     return;
   }
   bool bRMfinished = false;
@@ -199,7 +200,7 @@
   DIR *dir;
   struct dirent *dirent;
   if (!(dir = opendir(m_sDir))) {
-    AIM_ERROR(_T("Couldn't remove files in temporary directory."));
+    LOG_ERROR(_T("Couldn't remove files in temporary directory."));
     return;
   }
   while (dirent = readdir(dir)) {
@@ -254,3 +255,4 @@
             sStr);
   }
 }
+}  // namespace aimc