Move WIDTH/HEIGHT #defines into defs.h.

diff --git a/defs.h b/defs.h
index 580ced7d71ba8a8c19a78a737bd4689e95475762..2b578983c686032c89236ce0fbdc9b95bc12936e 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -4,6 +4,8 @@
 // OUTPUT_FREQUENCY/FPS must be an integer for now.
 #define OUTPUT_FREQUENCY 48000
 #define FPS 60
+#define WIDTH 1280
+#define HEIGHT 720
 
 #define AUDIO_OUTPUT_CODEC AV_CODEC_ID_PCM_S32LE
 #define AUDIO_OUTPUT_SAMPLE_FMT AV_SAMPLE_FMT_S32

diff --git a/mixer.cpp b/mixer.cpp
index 72ae215f54cb993967de0e8a9ea8eb2bb3f0d3e7..42a02521258e93f34c71518c4de0917135c2fad4 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -1,5 +1,3 @@
-#define WIDTH 1280
-#define HEIGHT 720
 #define EXTRAHEIGHT 30
 
 #undef Success

diff --git a/theme.cpp b/theme.cpp
index f7ec8e8b8db32fcd4890c93b56b583e28d046e4c..61e2aedf743002c3784bebb63bc21a784f937efe 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -22,15 +22,13 @@
 #include <utility>
 #include <memory>
 
+#include "defs.h"
 #include "image_input.h"
 
 namespace movit {
 class ResourcePool;
 }  // namespace movit
 
-#define WIDTH 1280  // FIXME
-#define HEIGHT 720  // FIXME
-
 using namespace std;
 using namespace movit;