1 files changed, 0 insertions, 226 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
deleted file mode 100644
index 67aba36f2..000000000
--- a/src/lib/player.cc
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <sstream>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <boost/thread.hpp>
-#include <boost/algorithm/string.hpp>
-#include "player.h"
-#include "filter.h"
-#include "screen.h"
-#include "exceptions.h"
-
-using namespace std;
-using namespace boost;
-
-Player::Player (shared_ptr<const FilmState> fs, shared_ptr<const Screen> screen, Split split)
-	: _stdout_reader_should_run (true)
-	, _position (0)
-	, _paused (false)
-{
-	assert (fs->format);
-	
-	if (pipe (_mplayer_stdin) < 0) {
-		throw PlayError ("could not create pipe");
-	}
-
-	if (pipe (_mplayer_stdout) < 0) {
-		throw PlayError ("could not create pipe");
-	}
-
-	if (pipe (_mplayer_stderr) < 0) {
-		throw PlayError ("could not create pipe");
-	}
-	
-	int const p = fork ();
-	if (p < 0) {
-		throw PlayError ("could not fork for mplayer");
-	} else if (p == 0) {
-		close (_mplayer_stdin[1]);
-		dup2 (_mplayer_stdin[0], STDIN_FILENO);
-		
-		close (_mplayer_stdout[0]);
-		dup2 (_mplayer_stdout[1], STDOUT_FILENO);
-		
-		close (_mplayer_stderr[0]);
-		dup2 (_mplayer_stderr[1], STDERR_FILENO);
-
-		char* p[] = { strdup ("TERM=xterm"), strdup ("DISPLAY=:0"), 0 };
-		environ = p;
-
-		stringstream s;
-		s << "/usr/local/bin/mplayer";
-
-		s << " -vo x11 -noaspect -noautosub -nosub -vo x11 -noborder -slave -quiet -input nodefault-bindings:conf=/dev/null";
-		s << " -sws " << fs->scaler->mplayer_id ();
-
-		stringstream vf;
-		
-		Position position = screen->position (fs->format);
-		Size screen_size = screen->size (fs->format);
-		Size const cropped_size = fs->cropped_size (fs->size);
-		switch (split) {
-		case SPLIT_NONE:
-			vf << crop_string (Position (fs->left_crop, fs->top_crop), cropped_size);
-			s << " -geometry " << position.x << ":" << position.y;
-			break;
-		case SPLIT_LEFT:
-		{
-			Size split_size = cropped_size;
-			split_size.width /= 2;
-			vf << crop_string (Position (fs->left_crop, fs->top_crop), split_size);
-			screen_size.width /= 2;
-			s << " -geometry " << position.x << ":" << position.y;
-			break;
-		}
-		case SPLIT_RIGHT:
-		{
-			Size split_size = cropped_size;
-			split_size.width /= 2;
-			vf << crop_string (Position (fs->left_crop + split_size.width, fs->top_crop), split_size);
-			screen_size.width /= 2;
-			s << " -geometry " << (position.x + screen_size.width) << ":" << position.y;
-			break;
-		}
-		}
-
-		vf << ",scale=" << screen_size.width << ":" << screen_size.height;
-		
-		pair<string, string> filters = Filter::ffmpeg_strings (fs->filters);
-		
-		if (!filters.first.empty()) {
-			vf << "," << filters.first;
-		}
-		
-		if (!filters.second.empty ()) {
-			vf << ",pp=" << filters.second;
-		}
-		
-		s << " -vf " << vf.str();
-		s << " \"" << fs->content_path() << "\" ";
-
-		string cmd (s.str ());
-
-		vector<string> b = split_at_spaces_considering_quotes (cmd);
-		
-		char** cl = new char*[b.size() + 1];
-		for (vector<string>::size_type i = 0; i < b.size(); ++i) {
-			cl[i] = strdup (b[i].c_str ());
-		}
-		cl[b.size()] = 0;
-		
-		execv (cl[0], cl);
-
-		stringstream e;
-		e << "exec of mplayer failed " << strerror (errno);
-		throw PlayError (e.str ());
-		
-	} else {
-		_mplayer_pid = p;
-		command ("pause");
-
-		_stdout_reader = new boost::thread (boost::bind (&Player::stdout_reader, this));
-	}
-}
-
-Player::~Player ()
-{
-	_stdout_reader_should_run = false;
-	_stdout_reader->join ();
-	delete _stdout_reader;
-	
-	close (_mplayer_stdin[0]);
-	close (_mplayer_stdout[1]);
-	kill (_mplayer_pid, SIGTERM);
-}
-
-void
-Player::command (string c)
-{
-	char buf[64];
-	snprintf (buf, sizeof (buf), "%s\n", c.c_str ());
-	write (_mplayer_stdin[1], buf, strlen (buf));
-}
-
-void
-Player::stdout_reader ()
-{
-	while (_stdout_reader_should_run) {
-		char buf[1024];
-		int r = read (_mplayer_stdout[0], buf, sizeof (buf));
-		if (r > 0) {
-			stringstream s (buf);
-			while (s.good ()) {
-				string line;
-				getline (s, line);
-
-				vector<string> b;
-				split (b, line, is_any_of ("="));
-				if (b.size() < 2) {
-					continue;
-				}
-
-				if (b[0] == "ANS_time_pos") {
-					set_position (atof (b[1].c_str ()));
-				} else if (b[0] == "ANS_pause") {
-					set_paused (b[1] == "yes");
-				}
-			}
-		}
-
-		usleep (5e5);
-
-		snprintf (buf, sizeof (buf), "pausing_keep_force get_property time_pos\npausing_keep_force get_property pause\n");
-		write (_mplayer_stdin[1], buf, strlen (buf));
-	}
-}
-
-void
-Player::set_position (float p)
-{
-	/* XXX: could be an atomic */
-	boost::mutex::scoped_lock lm (_state_mutex);
-	_position = p;
-}
-
-void
-Player::set_paused (bool p)
-{
-	/* XXX: could be an atomic */
-	boost::mutex::scoped_lock lm (_state_mutex);
-	_paused = p;
-}
-
-float
-Player::position () const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-	return _position;
-}
-
-bool
-Player::paused () const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-	return _paused;
-}