From bae8bf34ea5b889da1ec2a528f0a006ac0f9c64c Mon Sep 17 00:00:00 2001
From: "T. Lohmar" <smarttv640@gmail.com>
Date: Thu, 12 Jun 2014 21:30:51 +0200
Subject: Configuration Cleanups

---
 smarttvweb.conf | 12 +++---------
 stvw_cfg.c      | 12 ++++++------
 widget.conf     | 16 ++++++++++------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/smarttvweb.conf b/smarttvweb.conf
index ee01fa2..0fac880 100755
--- a/smarttvweb.conf
+++ b/smarttvweb.conf
@@ -36,12 +36,6 @@ GroupSeparators Ignore
 # To enable the plugin built-in solution for live, uncomment the following parameter. 
 #UseStreamDev4Live false
 
-# Define the startup mode for the built-in live solution. Default is 2.
-# 0: just start
-# 1: start with first pcr
-# 2: start with first I Frame
-#BuiltInLiveStartMode 0
-
-# Number of TS backets in local buffer before start. 
-#BuiltInLivePktBuf4Hd 150
-#BuiltInLivePktBuf4Sd 75
+# Only used, when UseStreamDev4Live is false 
+# Buffer duration in the plugin for live (in milliseconds)
+BuiltInLiveBufDur 600
diff --git a/stvw_cfg.c b/stvw_cfg.c
index 2c0f252..4ca2559 100755
--- a/stvw_cfg.c
+++ b/stvw_cfg.c
@@ -34,7 +34,7 @@
 cSmartTvConfig::cSmartTvConfig(string d): mConfigDir(d), mLog(NULL), mCfgFile(NULL),
   mLogFile(), mMediaFolder(), mSegmentDuration(), mHasMinBufferTime(), mHasBitrateCorrection(),
   mLiveChannels(), mGroupSep(IGNORE), mServerAddress(""), mServerPort(8000), mCmds(false), mUseStreamDev4Live(true),
-  mBuiltInLiveStartMode (2), mBuiltInLivePktBuf4Hd(150), mBuiltInLivePktBuf4Sd(75), mBuiltInLiveBufDur(0.6) {
+  mBuiltInLiveStartMode (4), mBuiltInLivePktBuf4Hd(150), mBuiltInLivePktBuf4Sd(75), mBuiltInLiveBufDur(0.6) {
 
 #ifndef STANDALONE
   mLogFile= "";
@@ -70,9 +70,9 @@ void cSmartTvConfig::printConfig() {
   *(mLog->log()) << " GroupSeparators: " << ((mGroupSep==IGNORE)? "Ignore" : ((mGroupSep==EMPTYIGNORE)? "EmptyIgnore": "EmptyFolderDown")) << endl;
   *(mLog->log()) << " ServerAddress: " << mServerAddress << endl;
   *(mLog->log()) << " UseStreamDev4Live: " << ((mUseStreamDev4Live) ? "true" :"false") << endl;
-  *(mLog->log()) << " BuiltInLiveStartMode: " << mBuiltInLiveStartMode << endl;
-  *(mLog->log()) << " BuiltInLivePktBuf4Hd: " << mBuiltInLivePktBuf4Hd << endl;
-  *(mLog->log()) << " BuiltInLivePktBuf4Sd: " << mBuiltInLivePktBuf4Sd << endl;
+  //  *(mLog->log()) << " BuiltInLiveStartMode: " << mBuiltInLiveStartMode << endl;
+  //  *(mLog->log()) << " BuiltInLivePktBuf4Hd: " << mBuiltInLivePktBuf4Hd << endl;
+  //  *(mLog->log()) << " BuiltInLivePktBuf4Sd: " << mBuiltInLivePktBuf4Sd << endl;
   *(mLog->log()) << " BuiltInLiveBufDur: " << mBuiltInLiveBufDur << endl;
 }
 
@@ -167,13 +167,12 @@ void cSmartTvConfig::readConfig() {
       continue;
     }
 
-    if (strcmp(attr, "BuiltInLiveStartMode") == 0) {
+    /*    if (strcmp(attr, "BuiltInLiveStartMode") == 0) {
       mBuiltInLiveStartMode = atoi(value);
       if ((mBuiltInLiveStartMode <0) || (mBuiltInLiveStartMode > 4))
 	mBuiltInLiveStartMode = 0;
       continue;
     }
-
     if (strcmp(attr, "BuiltInLivePktBuf4Hd") == 0) {
       mBuiltInLivePktBuf4Hd = atoi(value);
       continue;
@@ -182,6 +181,7 @@ void cSmartTvConfig::readConfig() {
       mBuiltInLivePktBuf4Sd = atoi(value);
       continue;
     }
+*/
 
     if (strcmp(attr, "BuiltInLiveBufDur") == 0) {
       mBuiltInLiveBufDur = atoi(value) /1000.0;
diff --git a/widget.conf b/widget.conf
index 0ce0ce7..3d2420b 100644
--- a/widget.conf
+++ b/widget.conf
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-<format>hls</format>
-<tgtBufferBitrate>6000000</tgtBufferBitrate>
-<totalBufferDuration>40</totalBufferDuration>
-<initialBuffer>5</initialBuffer>
-<pendingBuffer>5</pendingBuffer>
-<initialTimeOut>5</initialTimeOut>
+<useDefaultBuffer>false</useDefaultBuffer>
+<totalBufferSize>3500000</totalBufferSize>
+<initialBufferSize>1000000</initialBufferSize>
+<pendingBufferSize>500000</pendingBufferSize>
 <skipDuration>30</skipDuration>
+<usePdlForRecordings>true</usePdlForRecordings>
+<format>hls</format>
 <liveChannels>20</liveChannels>
 <directAccessTimeout>2000</directAccessTimeout>
+<sortType>0</sortType>
+<playKeyBehavior>0</playKeyBehavior>
+<showInfoMsgs>true</showInfoMsgs>
+<widgetdebug>false</widgetdebug>
 </config>
-- 
cgit v1.2.3