diff --git a/Makefile b/Makefile index 45046b2..fe43da3 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,9 @@ FLAGS=-g LIBS= `pkg-config --cflags jlibcpp` \ `pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io -INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include \ --I extratorCC/src/include -I extratorSRT/src/include -I monitorPCR/src/include -I codificador/src/include \ --I input/src/include -I demux/src/include -I servico/src/include -I synchronizer/src/include -I mixer/src/include \ --I recognize/src/include -I extratorTXT/src/include +INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include -I extratorSRT/src/include \ +-I monitorPCR/src/include -I input/src/include -I servico/src/include -I synchronizer/src/include \ +-I mixer/src/include -I recognize/src/include -I extratorTXT/src/include #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall utilObjs = \ @@ -24,21 +23,6 @@ pyTradutor.o \ tradutorPortGlosa.o \ ouvinteTradutor.o -demuxObjs = \ -bitutil_hal.o \ -demux.o \ -filter.o \ -packet.o \ -sectionBuffer.o \ -section_hal.o \ -util.o \ -demuxListener.o \ -ouvinteDemux.o - -extratorCCObjs = \ -extratorCC.o \ -ouvinteCC.o - extratorSRTObjs = \ extratorSRT.o \ reader_exception.o \ @@ -53,16 +37,6 @@ extratorTXT_exception.o monitorPCRObjs = \ monitor_pcr.o -codificadorObjs = \ -crc32.o \ -inmanagementdata.o \ -librascontrolmessage.o \ -librascontrolsection.o \ -librasdatamessage.o \ -recebeglosa.o \ -librassection.o \ -codificadormanager.o - #inipMpeg.o \ #inipRaw.o \ #inputMpeg.o \ @@ -78,7 +52,6 @@ ouvinteInput.o servicoObjs = \ serviceWindowGeneration.o \ serviceWindowGenerationFromSRT.o \ -serviceWindowGenerationFromCC.o \ serviceWindowGenerationFromREC.o \ serviceWindowGenerationFromText.o \ serviceException.o @@ -97,10 +70,7 @@ recognizeException.o utilObjsPre = $(addprefix util/src/,$(utilObjs) ) tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) ) -extratorCCObjsPre = $(addprefix extratorCC/src/,$(extratorCCObjs) ) -codificadorObjsPre = $(addprefix codificador/src/,$(codificadorObjs) ) inputObjsPre = $(addprefix input/src/,$(inputObjs) ) -demuxObjsPre = $(addprefix demux/src/,$(demuxObjs) ) servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) ) synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) ) mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) ) @@ -109,7 +79,7 @@ monitorPCRObjsPre = $(addprefix monitorPCR/src/,$(monitorPCRObjs) ) recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) ) extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) ) -OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorCCObjsPre) $(extratorTXTObjsPre) $(codificadorObjsPre) $(inputObjsPre) $(demuxObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o +OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o all: user_config libras diff --git a/main.cpp b/main.cpp index b219b54..de63242 100644 --- a/main.cpp +++ b/main.cpp @@ -12,7 +12,6 @@ * Edit on 03 de Fevereiro de 2014 */ -#include "serviceWindowGenerationFromCC.h" #include "serviceWindowGenerationFromSRT.h" #include "serviceWindowGenerationFromREC.h" #include "serviceWindowGenerationFromText.h" diff --git a/servico/src/include/serviceWindowGeneration.h b/servico/src/include/serviceWindowGeneration.h index 90d0b44..1ebc06e 100644 --- a/servico/src/include/serviceWindowGeneration.h +++ b/servico/src/include/serviceWindowGeneration.h @@ -4,10 +4,7 @@ #include #include #include -#include "extratorCC.h" -#include "demux.h" #include "dprintf.h" -#include "inmanagementdata.h" #include "ouvinteTradutor.h" #include "tradutorPortGlosa.h" #include @@ -26,7 +23,7 @@ #include "serviceException.h" #include -#define SERVICE_TYPE_CC 1 /* Closed Caption */ +/*#define SERVICE_TYPE_CC 1 /* Closed Caption */ #define SERVICE_TYPE_SRT 2 /* Subtitle SRT */ #define SERVICE_TYPE_REC 3 /* Reconhecimento de Voz */ #define SERVICE_TYPE_TEXT 4 /* Texto */ diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp index 6aec4f8..7d50406 100644 --- a/servico/src/serviceWindowGeneration.cpp +++ b/servico/src/serviceWindowGeneration.cpp @@ -179,7 +179,7 @@ void ServiceWindowGeneration::initialize() { } /* Se for SERVICE_TYPE_REC (Recognized) não é necessário usar o monitor_pcr_base */ - if (serviceType == SERVICE_TYPE_CC || serviceType == SERVICE_TYPE_SRT) { + if (serviceType == SERVICE_TYPE_SRT) { char* extensao = (char*) tokens[1].c_str(); this->monitor_pcr_base->extvideo = new char[strlen(extensao)]; diff --git a/tradutor/src/include/tradutorPortGlosa.h b/tradutor/src/include/tradutorPortGlosa.h index b537d2e..ded5d59 100644 --- a/tradutor/src/include/tradutorPortGlosa.h +++ b/tradutor/src/include/tradutorPortGlosa.h @@ -18,7 +18,6 @@ #include #include "ouvinteTradutor.h" #include "pyTradutor.h" -#include "ouvinteCC.h" #include "ouvinteInput.h" #include "dprintf.h" @@ -27,7 +26,7 @@ namespace Tradutor { - class TradutorPortGlosa : public OuvinteInput, public OuvinteCC{ + class TradutorPortGlosa : public OuvinteInput{ public: TradutorPortGlosa(); virtual ~TradutorPortGlosa(); @@ -41,7 +40,7 @@ namespace Tradutor { void traduz(unsigned char * texto); virtual void chegouInput(unsigned char * texto); - virtual void notificaCC(unsigned char * cc, int64_t pts); + //virtual void notificaCC(unsigned char * cc, int64_t pts); private: diff --git a/tradutor/src/tradutorPortGlosa.cpp b/tradutor/src/tradutorPortGlosa.cpp index 364bc2a..ecb8252 100644 --- a/tradutor/src/tradutorPortGlosa.cpp +++ b/tradutor/src/tradutorPortGlosa.cpp @@ -60,14 +60,14 @@ namespace Tradutor { } } - + /* // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC void TradutorPortGlosa::notificaCC(unsigned char * cc, int64_t pts) { // Mutex para evitar bug multiplas chamadas dos notificadores pthread_mutex_lock(mutex); traduz(cc); pthread_mutex_unlock(mutex); - } + }*/ // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC void TradutorPortGlosa::chegouInput(unsigned char * texto) { -- libgit2 0.21.2