From f47b14b717c16fc82f3f33b0bc5259f446a1aafa Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 26 Jan 2015 02:21:00 +0100
Subject: video/out: cosmetics: rename VO_EVENT_ICC_PROFILE_PATH_CHANGED

Remove the "PATH" bit, because VOCTRL_GET_ICC_PROFILE returns an in-
memory profile, and not a path. (This was changed a while ago.)
---
 video/out/cocoa_common.m | 6 +++---
 video/out/vo.h           | 2 +-
 video/out/vo_opengl.c    | 2 +-
 video/out/x11_common.c   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'video')

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 47f686dbd4..e89504c472 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -419,7 +419,7 @@ static void cocoa_add_fs_screen_profile_observer(struct vo *vo)
         return;
 
     void (^nblock)(NSNotification *n) = ^(NSNotification *n) {
-        s->pending_events |= VO_EVENT_ICC_PROFILE_PATH_CHANGED;
+        s->pending_events |= VO_EVENT_ICC_PROFILE_CHANGED;
     };
 
     s->fs_icc_changed_ns_observer = [[NSNotificationCenter defaultCenter]
@@ -586,7 +586,7 @@ static void vo_cocoa_fullscreen(struct vo *vo)
     draw_changes_after_next_frame(vo);
     [(MpvEventsView *)s->view setFullScreen:opts->fullscreen];
 
-    s->pending_events |= VO_EVENT_ICC_PROFILE_PATH_CHANGED;
+    s->pending_events |= VO_EVENT_ICC_PROFILE_CHANGED;
     s->pending_events |= VO_EVENT_RESIZE;
 }
 
@@ -736,6 +736,6 @@ int vo_cocoa_control(struct vo *vo, int *events, int request, void *arg)
 - (void)didChangeWindowedScreenProfile:(NSScreen *)screen
 {
     struct vo_cocoa_state *s = self.vout->cocoa;
-    s->pending_events |= VO_EVENT_ICC_PROFILE_PATH_CHANGED;
+    s->pending_events |= VO_EVENT_ICC_PROFILE_CHANGED;
 }
 @end
diff --git a/video/out/vo.h b/video/out/vo.h
index 60680813b8..9be92ac482 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -35,7 +35,7 @@
 // VO needs to update state to a new window size
 #define VO_EVENT_RESIZE 2
 // The ICC profile needs to be reloaded
-#define VO_EVENT_ICC_PROFILE_PATH_CHANGED 4
+#define VO_EVENT_ICC_PROFILE_CHANGED 4
 // Some other window state changed
 #define VO_EVENT_WIN_STATE 8
 
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 329a022ab0..910ebb8ca3 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -378,7 +378,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
     mpgl_lock(p->glctx);
     int events = 0;
     int r = p->glctx->vo_control(vo, &events, request, data);
-    if (events & VO_EVENT_ICC_PROFILE_PATH_CHANGED) {
+    if (events & VO_EVENT_ICC_PROFILE_CHANGED) {
         get_and_update_icc_profile(p, &events);
         vo->want_redraw = true;
     }
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 804c62b805..0e02069ae6 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -971,7 +971,7 @@ int vo_x11_check_events(struct vo *vo)
             } else if (Event.xproperty.atom == XA(x11, _NET_WM_STATE)) {
                 x11->pending_vo_events |= VO_EVENT_WIN_STATE;
             } else if (Event.xproperty.atom == x11->icc_profile_property) {
-                x11->pending_vo_events |= VO_EVENT_ICC_PROFILE_PATH_CHANGED;
+                x11->pending_vo_events |= VO_EVENT_ICC_PROFILE_CHANGED;
             }
             break;
         default:
@@ -1554,7 +1554,7 @@ static void vo_x11_update_geometry(struct vo *vo)
         MP_VERBOSE(x11, "Current display FPS: %f\n", fps);
     x11->current_display_fps = fps;
     // might have changed displays
-    x11->pending_vo_events |= VO_EVENT_WIN_STATE | VO_EVENT_ICC_PROFILE_PATH_CHANGED;
+    x11->pending_vo_events |= VO_EVENT_WIN_STATE | VO_EVENT_ICC_PROFILE_CHANGED;
 }
 
 static void vo_x11_fullscreen(struct vo *vo)
-- 
cgit v1.2.3