comparison 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

 #  include <dirent.h> // for opendir&friends
 #endif
 #include <stdio.h>
 #include <string.h>
 
-
-#include "Output/GraphicsOutputDeviceMovie.h"
+#include "Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.h"
+
+namespace aimc {
 
 GraphicsOutputDeviceMovie::GraphicsOutputDeviceMovie(Parameters *pParam)
   : GraphicsOutputDeviceCairo(pParam) {  // or GraphicsOutputDevicePlotutils
   m_sMovieFile[0] = '\0';
   m_sSoundFile[0] = '\0';

   AIM_ASSERT(sSoundFile);
   AIM_ASSERT(sMovieFile);
 
   // 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;
   }
   fclose(f);
   strcpy(m_sSoundFile, sSoundFile);
 
   // 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;
   }
   fclose(f);
   strcpy(m_sMovieFile, sMovieFile);

   if (mkdtemp(m_sDir)) {
     strcat(m_sDir, "/"); // Make sure to end with trailing slash
   } 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;
   }
   if (sTmpDir) {
     free(sTmpDir);

     m_pParam->GetString("output.movie.title"),
     fFps, sCodecOptions, m_sMovieFile);
     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__
   // GUI only: close dialog again
 #endif

 #ifdef _WINDOWS
   HANDLE hList;
   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;
   while (!bRMfinished) {
     snprintf(sCmdLine,

   _rmdir(m_sDir);
 #else
   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)) {
     snprintf(sCmdLine,
              sizeof(sCmdLine)/sizeof(sCmdLine[0]),

     gText2f(fMarL,
             1-(fMarT+fTextHeight*lineno++),
             sStr);
   }
 }
+}  // namespace aimc