Remove pointless Writer parent.

4 files changed, 3 insertions, 78 deletions

diff --git a/src/dcp_writer.h b/src/dcp_writer.h
deleted file mode 100644
index 0472abc..0000000
--- a/src/dcp_writer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    Copyright (C) 2014 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.
-
-*/
-
-namespace sub {
-
-class DCPWriter
-{
-
-
-};
-
-}
diff --git a/src/stl_text_writer.cc b/src/stl_text_writer.cc
index 3b43fc1..6a8601d 100644
--- a/src/stl_text_writer.cc
+++ b/src/stl_text_writer.cc
@@ -26,8 +26,8 @@ using std::string;
 using boost::optional;
 using namespace sub;
 
-STLTextWriter::STLTextWriter (list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, ostream& out)
-	: Writer (subtitles, screen_height_in_points, frames_per_second)
+void
+sub::write_stl_text (list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, ostream& out)
 {
 	optional<string> font;
 	optional<int> font_size;
diff --git a/src/stl_text_writer.h b/src/stl_text_writer.h
index a3020f6..d44696f 100644
--- a/src/stl_text_writer.h
+++ b/src/stl_text_writer.h
@@ -17,15 +17,10 @@
 
 */
 
-#include "writer.h"
 #include "subtitle.h"
 
 namespace sub {
 
-class STLTextWriter : public Writer
-{
-public:
-	STLTextWriter (std::list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, std::ostream &);
-};
+extern void write_stl_text (std::list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second, std::ostream &);
 
 }
diff --git a/src/writer.h b/src/writer.h
deleted file mode 100644
index 057214e..0000000
--- a/src/writer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (C) 2014 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 <list>
-#include <iostream>
-
-namespace sub {
-
-class Subtitle;	
-
-class Writer
-{
-public:
-	Writer (std::list<Subtitle> subtitles, int screen_height_in_points, float frames_per_second)
-		: _subs (subtitles)
-		, _screen_height_in_points (screen_height_in_points)
-		, _frames_per_second (frames_per_second)
-	{}
-
-protected:
-	std::list<Subtitle> _subs;
-	int _screen_height_in_points;
-	float _frames_per_second;
-};
-
-}