comparison trunk/src/Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.h @ 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

  */
 
 #ifndef __GRAPHICS_OUTPUT_DEVICE_MOVIE_H__
 #define __GRAPHICS_OUTPUT_DEVICE_MOVIE_H__
 
-#include "Support/util.h"
 //#include "Modules/Output/Graphics/Devices/GraphicsOutputDevicePlotutils.h"
 #include "Modules/Output/Graphics/Devices/GraphicsOutputDeviceCairo.h"
+
+namespace aimc {
 
 /*!
  * \class GraphicsOutputDeviceMovie "Output/GraphicsOutputDeviceMovie.h"
  * \brief Output class for output to a movie
  */
  // GraphicsOutputDevicePlotutils is also possible here
 class GraphicsOutputDeviceMovie : public GraphicsOutputDeviceCairo {
  public:
-  GraphicsOutputDeviceMovie(AimParameters *pParam);
+  GraphicsOutputDeviceMovie(Parameters *pParam);
   virtual ~GraphicsOutputDeviceMovie() { };
 
   /*! \brief Initializes this output device, prepares plotting tools.
    *  \param sSoundFile Sound file for the movie
    *  \param sMovieFile Movie filename to produce

   //! \brief Name of the sound file to be merged with the video
   char m_sSoundFile[PATH_MAX];
   //! \brief Name of the movie file to produce
   char m_sMovieFile[PATH_MAX];
 };
-
+}  // namespace aimc
 #endif /* __GRAPHICS_OUTPUT_DEVICE_MOVIE_H__ */