Try to fix Windows build.
authorCarl Hetherington <cth@carlh.net>
Fri, 10 Aug 2018 01:28:10 +0000 (02:28 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 10 Aug 2018 01:28:10 +0000 (02:28 +0100)
src/lib/player.cc
src/lib/player.h

index 782e445e8ad3a3487c409cbbed725e193da12131..41cf52f2c8e5d1d692f97cc98380c37de1ea7b47 100644 (file)
@@ -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 */
index ccdd4e12c34c113836e3c9b588f7597a490626e9..c6e657d162cf0558b7191bd2a3a5d728d5fe25d9 100644 (file)
@@ -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;
 };