summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-10-02 21:19:16 +0200
committerwm4 <wm4@nowhere>2013-10-02 21:19:16 +0200
commitef9c5300ef02427db606273ac1f461a68c6c95ec (patch)
tree2a9dcf87ac7e03e1f8aa5e9b25349e21a780dba6 /stream
parent93b712fa8ab56217da2e8a5317891f4d0df1838f (diff)
downloadmpv-ef9c5300ef02427db606273ac1f461a68c6c95ec.tar.bz2
mpv-ef9c5300ef02427db606273ac1f461a68c6c95ec.tar.xz
cosmetics: replace "CTRL" defines by enums
Because why not.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.h52
1 files changed, 27 insertions, 25 deletions
diff --git a/stream/stream.h b/stream/stream.h
index 49d9abcf67..651aa9a310 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -73,31 +73,33 @@ enum streamtype {
#define MAX_STREAM_PROTOCOLS 20
-#define STREAM_CTRL_GET_TIME_LENGTH 1
-#define STREAM_CTRL_SEEK_TO_CHAPTER 2
-#define STREAM_CTRL_GET_CURRENT_CHAPTER 3
-#define STREAM_CTRL_GET_NUM_CHAPTERS 4
-#define STREAM_CTRL_GET_CURRENT_TIME 5
-#define STREAM_CTRL_SEEK_TO_TIME 6
-#define STREAM_CTRL_GET_SIZE 7
-#define STREAM_CTRL_GET_ASPECT_RATIO 8
-#define STREAM_CTRL_GET_NUM_ANGLES 9
-#define STREAM_CTRL_GET_ANGLE 10
-#define STREAM_CTRL_SET_ANGLE 11
-#define STREAM_CTRL_GET_NUM_TITLES 12
-#define STREAM_CTRL_GET_LANG 13
-#define STREAM_CTRL_GET_CURRENT_TITLE 14
-#define STREAM_CTRL_GET_CACHE_SIZE 15
-#define STREAM_CTRL_GET_CACHE_FILL 16
-#define STREAM_CTRL_GET_CACHE_IDLE 17
-#define STREAM_CTRL_RECONNECT 18
-// DVD/Bluray, signal general support for GET_CURRENT_TIME etc.
-#define STREAM_CTRL_MANAGES_TIMELINE 19
-#define STREAM_CTRL_GET_START_TIME 20
-#define STREAM_CTRL_GET_CHAPTER_TIME 21
-#define STREAM_CTRL_GET_DVD_INFO 22
-#define STREAM_CTRL_SET_CONTENTS 23
-#define STREAM_CTRL_GET_METADATA 24
+enum stream_ctrl {
+ STREAM_CTRL_GET_TIME_LENGTH = 1,
+ STREAM_CTRL_SEEK_TO_CHAPTER,
+ STREAM_CTRL_GET_CURRENT_CHAPTER,
+ STREAM_CTRL_GET_NUM_CHAPTERS,
+ STREAM_CTRL_GET_CURRENT_TIME,
+ STREAM_CTRL_SEEK_TO_TIME,
+ STREAM_CTRL_GET_SIZE,
+ STREAM_CTRL_GET_ASPECT_RATIO,
+ STREAM_CTRL_GET_NUM_ANGLES,
+ STREAM_CTRL_GET_ANGLE,
+ STREAM_CTRL_SET_ANGLE,
+ STREAM_CTRL_GET_NUM_TITLES,
+ STREAM_CTRL_GET_LANG,
+ STREAM_CTRL_GET_CURRENT_TITLE,
+ STREAM_CTRL_GET_CACHE_SIZE,
+ STREAM_CTRL_GET_CACHE_FILL,
+ STREAM_CTRL_GET_CACHE_IDLE,
+ STREAM_CTRL_RECONNECT,
+ // DVD/Bluray, signal general support for GET_CURRENT_TIME etc.
+ STREAM_CTRL_MANAGES_TIMELINE,
+ STREAM_CTRL_GET_START_TIME,
+ STREAM_CTRL_GET_CHAPTER_TIME,
+ STREAM_CTRL_GET_DVD_INFO,
+ STREAM_CTRL_SET_CONTENTS,
+ STREAM_CTRL_GET_METADATA,
+};
struct stream_lang_req {
int type; // STREAM_AUDIO, STREAM_SUB