diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-04 19:42:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-04 19:42:21 +0000 |
| commit | 3e915b00219ee8c97e50bbc775d90d0dddce87b6 (patch) | |
| tree | decb09d8d8c2cc90993db5e499030957ca59260e /src/lib/config.h | |
| parent | 8a9dd3e93325051c546193f680414d0c108b8332 (diff) | |
| parent | d7fe5fa4178af87b5f1e5a571a78313fa00c3327 (diff) | |
Merge branch 'dead-wood'
Diffstat (limited to 'src/lib/config.h')
| -rw-r--r-- | src/lib/config.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/config.h b/src/lib/config.h index c57e6b953..5113236d6 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -29,7 +29,6 @@ #include <boost/signals2.hpp> class ServerDescription; -class Screen; class Scaler; class Filter; class SoundProcessor; @@ -75,10 +74,6 @@ public: return _servers; } - std::vector<boost::shared_ptr<Screen> > screens () const { - return _screens; - } - Scaler const * reference_scaler () const { return _reference_scaler; } @@ -140,10 +135,6 @@ public: _servers = s; } - void set_screens (std::vector<boost::shared_ptr<Screen> > s) { - _screens = s; - } - void set_reference_scaler (Scaler const * s) { _reference_scaler = s; } @@ -195,8 +186,6 @@ private: /** J2K encoding servers to use */ std::vector<ServerDescription *> _servers; - /** Screen definitions */ - std::vector<boost::shared_ptr<Screen> > _screens; /** Scaler to use for the "A" part of A/B comparisons */ Scaler const * _reference_scaler; /** Filters to use for the "A" part of A/B comparisons */ |