Better OSD behavior, lots of build stuff

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 15 insertions, 7 deletions

diff --git a/src/screen/screen.h b/src/screen/screen.h
index c3dcd7d..0be414f 100644
--- a/src/screen/screen.h
+++ b/src/screen/screen.h
@@ -17,7 +17,7 @@
 // Interpret click and drag as seeking. Mainly a seek performance test.
 //#define CAMU_SCREEN_DRAG_SEEK
 
-#define CAMU_SCREEN_WIDTH 700
+#define CAMU_SCREEN_WIDTH 840
 #define CAMU_SCREEN_HEIGHT 700
 
 enum {
@@ -45,6 +45,8 @@ enum {
     CAMU_SCREEN_PERCENT_SEEK, // f64
     CAMU_SCREEN_RELATIVE_SEEK, // f64
     CAMU_SCREEN_RESEEK,
+    CAMU_SCREEN_AUDIO_TRACK, // s32
+    CAMU_SCREEN_SUBTITLE_TRACK, // s32
     CAMU_SCREEN_SHUFFLE,
     CAMU_SCREEN_STATUS,
     CAMU_SCREEN_PRINT,
@@ -60,10 +62,16 @@ struct camu_screen_video {
 };
 
 enum {
-    CAMU_OSD_PAUSE = 1,
-    CAMU_OSD_SEEK = 1 << 1,
-    CAMU_OSD_VOLUME = 1 << 2,
-    CAMU_OSD_EMPTY = 1 << 3
+    CAMU_OSD_CONNECTING = 1,
+    CAMU_OSD_PAUSE = 1 << 1,
+    CAMU_OSD_EMPTY = 1 << 2,
+    CAMU_OSD_TOGGLED = 1 << 3,
+    CAMU_OSD_ALT_TOGGLED = 1 << 4,
+    CAMU_OSD_KEY_HELD = 1 << 5
+};
+
+enum {
+    CAMU_OSD_ALT_BINDS = 1
 };
 
 enum {
@@ -76,13 +84,13 @@ enum {
 
 struct camu_osd {
     u32 show;
+    u8 alt;
     u8 shown_for;
-    bool show_binds;
+    f64 flash;
     u32 connecting;
     u32 paused;
     u32 bar_mode;
     f64 bar;
-    f64 flash;
     f64 pts;
     u64 duration;
 };