summaryrefslogtreecommitdiff
path: root/src/lib/config.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-09-17 22:50:47 +0100
committerCarl Hetherington <cth@carlh.net>2012-09-17 22:50:47 +0100
commit1e8f1be709e8a3fa58f1147db2e58a39396313d8 (patch)
tree1f86e375afbc1ec2a7e81ad48594bef7542bf71d /src/lib/config.h
parentd7135bda7b1db2ee2728c90ff4570c350834338f (diff)
Move server code into library; Server -> ServerDescription.
Diffstat (limited to 'src/lib/config.h')
-rw-r--r--src/lib/config.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/config.h b/src/lib/config.h
index 14b541ee6..b002da7df 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,7 +28,7 @@
#include <boost/shared_ptr.hpp>
#include <sigc++/signal.h>
-class Server;
+class ServerDescription;
class Screen;
class Scaler;
class Filter;
@@ -65,7 +65,7 @@ public:
}
/** @return J2K encoding servers to use */
- std::vector<Server*> servers () const {
+ std::vector<ServerDescription*> servers () const {
return _servers;
}
@@ -126,7 +126,7 @@ public:
}
/** @param s New list of servers */
- void set_servers (std::vector<Server*> s) {
+ void set_servers (std::vector<ServerDescription*> s) {
_servers = s;
Changed ();
}
@@ -188,7 +188,7 @@ private:
int _j2k_bandwidth;
/** J2K encoding servers to use */
- std::vector<Server *> _servers;
+ std::vector<ServerDescription *> _servers;
/** Screen definitions */
std::vector<boost::shared_ptr<Screen> > _screens;