From 93f2bb11fd9afe6fa8d895033194db32800c381e Mon Sep 17 00:00:00 2001
From: Erickson Silva <erickson.silva@lavid.ufpb.br>
Date: Fri, 16 Jan 2015 10:15:09 -0300
Subject: [PATCH] Corrige REC Only Audio

---
 recognize/src/include/recognize.h              | 3 ---
 recognize/src/recognize.cpp                    | 4 ----
 servico/src/include/serviceWindowGeneration.h  | 2 +-
 servico/src/serviceWindowGeneration.cpp        | 4 ++--
 servico/src/serviceWindowGenerationFromREC.cpp | 5 +----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/recognize/src/include/recognize.h b/recognize/src/include/recognize.h
index 5700745..b614438 100644
--- a/recognize/src/include/recognize.h
+++ b/recognize/src/include/recognize.h
@@ -45,15 +45,12 @@ public:
     void notifyPCRBase(uint64_t pcrbase);
 
 	bool isFinished();
-	void hasAudio();
-
 
     void Run();
 	int count_lines;
 
 private:
 	
-	bool isAudio;
     int64_t pcr_base;
     bool hasPCRBase;
 	char* pathVideo;
diff --git a/recognize/src/recognize.cpp b/recognize/src/recognize.cpp
index 6a018be..56553c7 100644
--- a/recognize/src/recognize.cpp
+++ b/recognize/src/recognize.cpp
@@ -124,10 +124,6 @@ void Recognize::Run(){
 	notifyEndExtraction(count_lines);
 }
 
-void Recognize::hasAudio(){
-	isAudio = true;
-}
-
 void Recognize::setFrequency(int freq) {
 	frequency = freq;
 }
diff --git a/servico/src/include/serviceWindowGeneration.h b/servico/src/include/serviceWindowGeneration.h
index 4ff403c..90d0b44 100644
--- a/servico/src/include/serviceWindowGeneration.h
+++ b/servico/src/include/serviceWindowGeneration.h
@@ -31,7 +31,7 @@
 #define SERVICE_TYPE_REC 3 /* Reconhecimento de Voz */
 #define SERVICE_TYPE_TEXT 4 /* Texto */
 #define SERVICE_TYPE_SRT_ONLY 5 /* Subtitle SRT ONLY */
-#define SERVICE_TYPE_REC_ONLY_LIBRAS 6 /* Subtitle SRT ONLY */
+#define SERVICE_TYPE_REC_ONLY_AUDIO 6 /* Subtitle AUDIO ONLY */
 
 using namespace Tradutor;
 using namespace Util;
diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp
index 3e20014..6aec4f8 100644
--- a/servico/src/serviceWindowGeneration.cpp
+++ b/servico/src/serviceWindowGeneration.cpp
@@ -46,7 +46,7 @@ bool ServiceWindowGeneration::isRunning() {
 
 /* Quando o sincronizador termina, ele invoca esse método para avisar! */
 void ServiceWindowGeneration::finalizouSincronizacao() {
-    if (getRunningOption() != '2' && serviceType == SERVICE_TYPE_REC && serviceType == SERVICE_TYPE_SRT) {
+    if (getRunningOption() != '2' && serviceType == SERVICE_TYPE_REC || serviceType == SERVICE_TYPE_SRT) {
         mixer = new Mixer();
         mixer->initialize(this->path_input, this->path_libras,this->position,this->size,this->transparency, this->user_id);
         createThumbnail();
@@ -149,7 +149,7 @@ void ServiceWindowGeneration::initialize() {
     vector<string> tokens;
     /* Se for texto não é necessário vídeo de entrada (path_input) */
     if (serviceType != SERVICE_TYPE_TEXT && serviceType != SERVICE_TYPE_SRT_ONLY &&
-            serviceType != SERVICE_TYPE_REC_ONLY_LIBRAS) {
+            serviceType != SERVICE_TYPE_REC_ONLY_AUDIO) {
         char * pathtmp = this->path_input;
     	int size = strlen(pathtmp);
     	char vtemp [size];
diff --git a/servico/src/serviceWindowGenerationFromREC.cpp b/servico/src/serviceWindowGenerationFromREC.cpp
index 86153c4..00cbafa 100644
--- a/servico/src/serviceWindowGenerationFromREC.cpp
+++ b/servico/src/serviceWindowGenerationFromREC.cpp
@@ -39,10 +39,7 @@ void ServiceWindowGenerationFromREC::initialize() {
 
     rec->addListener(this);
 
-    if (serviceType == 6){
-        rec->hasAudio();
-
-    } else {
+    if (serviceType != SERVICE_TYPE_REC_ONLY_AUDIO){
 
         inputfile = new InputFile(this->path_input);        
         monitor_pcr_base = new MonitorPCR();
--
libgit2 0.21.2