From 6800acad34e7b16d07da9d2dc7f2ecb93ee24b23 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Mon, 16 Nov 2015 18:53:15 +0100
Subject: [PATCH] Move WIDTH/HEIGHT #defines into defs.h.

---
 defs.h    | 2 ++
 mixer.cpp | 2 --
 theme.cpp | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/defs.h b/defs.h
index 580ced7..2b57898 100644
--- 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 72ae215..42a0252 100644
--- 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 f7ec8e8..61e2aed 100644
--- 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;
 
-- 
2.39.2