summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-23 10:20:56 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-23 10:20:56 +0100
commit0c3f91403eee01d4a1b2d2c520893de3a884a72d (patch)
treeee6003878063040b8687d6d58cefa40af34ec345 /src
parent062dfa793fe484fe6eeb3828fa6462b50b6a6b27 (diff)
Fix missing words in properties windows (#874).
Diffstat (limited to 'src')
-rw-r--r--src/lib/raw_convert.cc36
-rw-r--r--src/lib/raw_convert.h8
-rw-r--r--src/lib/wscript5
3 files changed, 47 insertions, 2 deletions
diff --git a/src/lib/raw_convert.cc b/src/lib/raw_convert.cc
new file mode 100644
index 000000000..4325f526f
--- /dev/null
+++ b/src/lib/raw_convert.cc
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2014-2016 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 "raw_convert.h"
+
+using std::string;
+
+template <>
+string
+raw_convert<string, string> (string v, int)
+{
+ return v;
+}
+
+template <>
+string
+raw_convert<string, char const *> (char const * v, int)
+{
+ return v;
+}
diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h
index 6e55d49cf..985c4e643 100644
--- a/src/lib/raw_convert.h
+++ b/src/lib/raw_convert.h
@@ -44,4 +44,12 @@ raw_convert (Q v, int precision = 16)
return r;
}
+template <>
+std::string
+raw_convert<std::string, char const *> (char const * v, int);
+
+template <>
+std::string
+raw_convert<std::string, std::string> (std::string v, int);
+
#endif
diff --git a/src/lib/wscript b/src/lib/wscript
index fe4eac114..6a9f5106c 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -115,11 +115,12 @@ sources = """
send_problem_report_job.cc
server.cc
string_log_entry.cc
+ raw_convert.cc
+ subtitle_content.cc
+ subtitle_decoder.cc
text_subtitle.cc
text_subtitle_content.cc
text_subtitle_decoder.cc
- subtitle_content.cc
- subtitle_decoder.cc
timer.cc
transcode_job.cc
transcoder.cc