From 7629ab6af0ac7261b4dfa4c012cc787e2cdca90f Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <immortal@localhost.(none)>
Date: Fri, 25 Jun 2010 22:43:32 +0200
Subject: [PATCH] Admin met filename

---
 Admin/main.cpp | 44 +++++++++++++++++++++++++++++++++++---------
 Admin/preset   |  1 +
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Admin/main.cpp b/Admin/main.cpp
index 2f3fab20..26255ef9 100644
--- a/Admin/main.cpp
+++ b/Admin/main.cpp
@@ -15,14 +15,24 @@ int getparam (std::string input) {
   return result;
 }
 
-void readpreset( unsigned int values[] ) {
+std::string getstringparam(std::string input) {
+  std::string result;
+  for (int i = 3; i < input.size(); i++) {
+    result.push_back(input[i]);
+  }
+  return result;
+}
+
+void readpreset( unsigned int values[], std::string & filename ) {
   std::ifstream presetfile ("preset");
+  presetfile >> filename;
   for (int i = 0; i < 9; i++ ) { presetfile >> values[i]; }
   presetfile.close();
 }
 
-void writepreset( unsigned int values[] ) {
+void writepreset( unsigned int values[], std::string filename ) {
   std::ofstream presetfile ("preset");
+  presetfile << filename;
   for (int i = 0; i < 9; i++ ) {
     presetfile << values[i];
     presetfile << "\n";
@@ -30,16 +40,16 @@ void writepreset( unsigned int values[] ) {
   presetfile.close();
 }
 
-void writesh( unsigned int values[] ) {
+void writesh( unsigned int values[], std::string filename ) {
   std::ofstream shfile ("run.sh");
-  shfile << "ffmpeg -i ../ts.mov -f flv -sameq -re ";
+  shfile << "ffmpeg -i " << filename << " -f flv -re ";
   if (values[0] != 0 && values[1] != 0) { shfile << "-s " << values[0] << "x" << values[1] << " "; }
   if (values[2] != 0) { shfile << "-b " <<   values[2] << " "; }
   if (values[3] != 0) { shfile << "-gop " << values[3] << " "; }
   if (values[4] != 0) { shfile << "-r " <<   values[4] << " "; }
   if (values[5] != 0) { shfile << "-ab " <<  values[5] << " "; }
   if (values[6] != 0) { shfile << "-ar " <<  values[6] << " "; }
-  shfile << "out.flv";
+  shfile << "rtmp://projectlivestream.com/oflaDemo/test";
   shfile.close();
 }
 
@@ -48,7 +58,8 @@ int main() {
   std::string inputcommand = "";
   bool connection = true;
   int tempresult;
-  readpreset(values);
+  std::string filename = "";
+  readpreset(values, filename);
   while (connection) {
     std::cin >> inputcommand;
     switch (inputcommand[0]) {
@@ -83,6 +94,12 @@ int main() {
               default: std::cout << "ER\n"; break;
             }
             break;
+          case 'F':
+            switch(inputcommand[2]) {
+              case 'N': std::cout << "OK" << filename << "\n"; break;
+              default: std::cout << "ER\n"; break;
+            }
+            break;
           default: std::cout << "ER\n"; break;
         }
         break;
@@ -145,6 +162,14 @@ int main() {
               default: std::cout << "ER\n"; break;
             }
             break;
+          case 'F':
+            switch(inputcommand[2]) {
+              case 'N':
+                filename = getstringparam(inputcommand); std::cout << "OK\n";
+                break;
+              default: std::cout << "ER\n"; break;
+            }
+            break;
           default: std::cout << "ER\n"; break;
         }
         break;
@@ -158,9 +183,9 @@ int main() {
             break;
           case 'S':
             switch (inputcommand[2]) {
-              case 'R': std::cout << "OK\n"; readpreset(values); break;
-              case 'S': std::cout << "OK\n"; writepreset(values); break;
-              case 'A': std::cout << "OK\n"; writesh(values); break;
+              case 'R': std::cout << "OK\n"; readpreset(values, filename); break;
+              case 'S': std::cout << "OK\n"; writepreset(values, filename); break;
+              case 'A': std::cout << "OK\n"; writesh(values, filename); break;
               default: std::cout << "ER\n"; break;
             }
             break;
@@ -172,3 +197,4 @@ int main() {
   }
   return 0;
 }
+
diff --git a/Admin/preset b/Admin/preset
index 1462ed63..419367aa 100644
--- a/Admin/preset
+++ b/Admin/preset
@@ -1,3 +1,4 @@
+../ts.mov
 0
 0
 0