From 6ea6f91795f6828ee5df60938f0501f6a2f653b0 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Tue, 3 Sep 2013 09:47:43 +0200
Subject: [PATCH] Fixed a bug in player CPU Usage, added language option to
 SRT2DTSC.

---
 src/buffer/player.cpp       | 1 +
 src/converters/srt2dtsc.cpp | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/buffer/player.cpp b/src/buffer/player.cpp
index 17df9d83..c02cd952 100644
--- a/src/buffer/player.cpp
+++ b/src/buffer/player.cpp
@@ -181,6 +181,7 @@ int main(int argc, char** argv){
               in_out.setBlocking(false);
               if (in_out.Received().get().size() >= 2){
                 playUntil = atoi(in_out.Received().get().substr(2).c_str());
+                lastTime = 0;
                 bench = Util::getMS();
               }else{
                 playUntil = 0;
diff --git a/src/converters/srt2dtsc.cpp b/src/converters/srt2dtsc.cpp
index b0cc1728..c758fb8c 100644
--- a/src/converters/srt2dtsc.cpp
+++ b/src/converters/srt2dtsc.cpp
@@ -21,7 +21,7 @@ namespace Converters {
 
   ///\brief Converts FLV from stdin to DTSC on stdout.
   ///\return The return code for the converter.
-  int SRT2DTSC(){
+  int SRT2DTSC(Util::Config & conf){
     int lineNum;
     int beginH, beginM, beginS, beginMs;
     int endH, endM, endS, endMs;
@@ -32,6 +32,7 @@ namespace Converters {
     meta["tracks"]["track3"]["trackid"] = 3ll;
     meta["tracks"]["track3"]["type"] = "meta";
     meta["tracks"]["track3"]["codec"] = "srt";
+    meta["tracks"]["track3"]["language"] = conf.getString("language");
     std::cout << meta.toNetPacked();
     JSON::Value newPack;
     while (std::cin.good()){
@@ -59,6 +60,8 @@ namespace Converters {
 ///\brief Entry point for SRT2DTSC, simply calls Converters::SRT2DTSC().
 int main(int argc, char ** argv){
   Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION);
+  conf.addOption("language",
+      JSON::fromString("{\"arg_num\":1,\"value\":[\"?\"], \"help\": \"The language of these subtitles.\"}"));
   conf.parseArgs(argc, argv);
-  return Converters::SRT2DTSC();
+  return Converters::SRT2DTSC(conf);
 } //main