From: Carl Hetherington <cth@carlh.net>
Date: Fri, 10 Aug 2018 01:28:10 +0000 (+0100)
Subject: Try to fix Windows build.
X-Git-Tag: v2.13.43~41
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=c9a97108df1d609bd13df8a21bee11d7ca55feea;hp=672b6dd3356d4cbf8703777538d396dbb868b96d;p=dcpomatic.git

Try to fix Windows build.
---

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 782e445e8..41cf52f2c 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -83,7 +83,7 @@ int const PlayerProperty::PLAYLIST = 701;
 int const PlayerProperty::FILM_CONTAINER = 702;
 int const PlayerProperty::FILM_VIDEO_FRAME_RATE = 703;
 int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
-int const PlayerProperty::IGNORE = 705;
+int const PlayerProperty::IGNORE_COMPONENTS = 705;
 int const PlayerProperty::FAST = 706;
 int const PlayerProperty::PLAY_REFERENCED = 707;
 
@@ -474,7 +474,7 @@ Player::set_ignore_video ()
 		_have_valid_pieces = false;
 	}
 
-	Changed (PlayerProperty::IGNORE, false);
+	Changed (PlayerProperty::IGNORE_COMPONENTS, false);
 }
 
 void
@@ -486,7 +486,7 @@ Player::set_ignore_audio ()
 		_have_valid_pieces = false;
 	}
 
-	Changed (PlayerProperty::IGNORE, false);
+	Changed (PlayerProperty::IGNORE_COMPONENTS, false);
 }
 
 void
@@ -498,7 +498,7 @@ Player::set_ignore_text ()
 		_have_valid_pieces = false;
 	}
 
-	Changed (PlayerProperty::IGNORE, false);
+	Changed (PlayerProperty::IGNORE_COMPONENTS, false);
 }
 
 /** Set the player to always burn open texts into the image regardless of the content settings */
diff --git a/src/lib/player.h b/src/lib/player.h
index ccdd4e12c..c6e657d16 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -56,7 +56,7 @@ public:
 	static int const FILM_CONTAINER;
 	static int const FILM_VIDEO_FRAME_RATE;
 	static int const DCP_DECODE_REDUCTION;
-	static int const IGNORE;
+	static int const IGNORE_COMPONENTS;
 	static int const FAST;
 	static int const PLAY_REFERENCED;
 };