Commit 2a840a72364d6f52c2c30df480d46e5fc86908c7

Authored by Wesnydy Ribeiro
1 parent 93f2bb11
Exists in master and in 1 other branch devel

Remoção de componentes não utilizados

@@ -9,10 +9,9 @@ FLAGS=-g @@ -9,10 +9,9 @@ FLAGS=-g
9 LIBS= `pkg-config --cflags jlibcpp` \ 9 LIBS= `pkg-config --cflags jlibcpp` \
10 `pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io 10 `pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io
11 11
12 -INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include \  
13 --I extratorCC/src/include -I extratorSRT/src/include -I monitorPCR/src/include -I codificador/src/include \  
14 --I input/src/include -I demux/src/include -I servico/src/include -I synchronizer/src/include -I mixer/src/include \  
15 --I recognize/src/include -I extratorTXT/src/include 12 +INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include -I extratorSRT/src/include \
  13 +-I monitorPCR/src/include -I input/src/include -I servico/src/include -I synchronizer/src/include \
  14 +-I mixer/src/include -I recognize/src/include -I extratorTXT/src/include
16 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall 15 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall
17 16
18 utilObjs = \ 17 utilObjs = \
@@ -24,21 +23,6 @@ pyTradutor.o \ @@ -24,21 +23,6 @@ pyTradutor.o \
24 tradutorPortGlosa.o \ 23 tradutorPortGlosa.o \
25 ouvinteTradutor.o 24 ouvinteTradutor.o
26 25
27 -demuxObjs = \  
28 -bitutil_hal.o \  
29 -demux.o \  
30 -filter.o \  
31 -packet.o \  
32 -sectionBuffer.o \  
33 -section_hal.o \  
34 -util.o \  
35 -demuxListener.o \  
36 -ouvinteDemux.o  
37 -  
38 -extratorCCObjs = \  
39 -extratorCC.o \  
40 -ouvinteCC.o  
41 -  
42 extratorSRTObjs = \ 26 extratorSRTObjs = \
43 extratorSRT.o \ 27 extratorSRT.o \
44 reader_exception.o \ 28 reader_exception.o \
@@ -53,16 +37,6 @@ extratorTXT_exception.o @@ -53,16 +37,6 @@ extratorTXT_exception.o
53 monitorPCRObjs = \ 37 monitorPCRObjs = \
54 monitor_pcr.o 38 monitor_pcr.o
55 39
56 -codificadorObjs = \  
57 -crc32.o \  
58 -inmanagementdata.o \  
59 -librascontrolmessage.o \  
60 -librascontrolsection.o \  
61 -librasdatamessage.o \  
62 -recebeglosa.o \  
63 -librassection.o \  
64 -codificadormanager.o  
65 -  
66 #inipMpeg.o \ 40 #inipMpeg.o \
67 #inipRaw.o \ 41 #inipRaw.o \
68 #inputMpeg.o \ 42 #inputMpeg.o \
@@ -78,7 +52,6 @@ ouvinteInput.o @@ -78,7 +52,6 @@ ouvinteInput.o
78 servicoObjs = \ 52 servicoObjs = \
79 serviceWindowGeneration.o \ 53 serviceWindowGeneration.o \
80 serviceWindowGenerationFromSRT.o \ 54 serviceWindowGenerationFromSRT.o \
81 -serviceWindowGenerationFromCC.o \  
82 serviceWindowGenerationFromREC.o \ 55 serviceWindowGenerationFromREC.o \
83 serviceWindowGenerationFromText.o \ 56 serviceWindowGenerationFromText.o \
84 serviceException.o 57 serviceException.o
@@ -97,10 +70,7 @@ recognizeException.o @@ -97,10 +70,7 @@ recognizeException.o
97 70
98 utilObjsPre = $(addprefix util/src/,$(utilObjs) ) 71 utilObjsPre = $(addprefix util/src/,$(utilObjs) )
99 tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) ) 72 tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) )
100 -extratorCCObjsPre = $(addprefix extratorCC/src/,$(extratorCCObjs) )  
101 -codificadorObjsPre = $(addprefix codificador/src/,$(codificadorObjs) )  
102 inputObjsPre = $(addprefix input/src/,$(inputObjs) ) 73 inputObjsPre = $(addprefix input/src/,$(inputObjs) )
103 -demuxObjsPre = $(addprefix demux/src/,$(demuxObjs) )  
104 servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) ) 74 servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
105 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) ) 75 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) )
106 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) ) 76 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
@@ -109,7 +79,7 @@ monitorPCRObjsPre = $(addprefix monitorPCR/src/,$(monitorPCRObjs) ) @@ -109,7 +79,7 @@ monitorPCRObjsPre = $(addprefix monitorPCR/src/,$(monitorPCRObjs) )
109 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) ) 79 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
110 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) ) 80 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
111 81
112 -OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorCCObjsPre) $(extratorTXTObjsPre) $(codificadorObjsPre) $(inputObjsPre) $(demuxObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o 82 +OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o
113 83
114 all: user_config libras 84 all: user_config libras
115 85
@@ -12,7 +12,6 @@ @@ -12,7 +12,6 @@
12 * Edit on 03 de Fevereiro de 2014 12 * Edit on 03 de Fevereiro de 2014
13 */ 13 */
14 14
15 -#include "serviceWindowGenerationFromCC.h"  
16 #include "serviceWindowGenerationFromSRT.h" 15 #include "serviceWindowGenerationFromSRT.h"
17 #include "serviceWindowGenerationFromREC.h" 16 #include "serviceWindowGenerationFromREC.h"
18 #include "serviceWindowGenerationFromText.h" 17 #include "serviceWindowGenerationFromText.h"
servico/src/include/serviceWindowGeneration.h
@@ -4,10 +4,7 @@ @@ -4,10 +4,7 @@
4 #include <stdlib.h> 4 #include <stdlib.h>
5 #include <locale> 5 #include <locale>
6 #include <string> 6 #include <string>
7 -#include "extratorCC.h"  
8 -#include "demux.h"  
9 #include "dprintf.h" 7 #include "dprintf.h"
10 -#include "inmanagementdata.h"  
11 #include "ouvinteTradutor.h" 8 #include "ouvinteTradutor.h"
12 #include "tradutorPortGlosa.h" 9 #include "tradutorPortGlosa.h"
13 #include <iostream> 10 #include <iostream>
@@ -26,7 +23,7 @@ @@ -26,7 +23,7 @@
26 #include "serviceException.h" 23 #include "serviceException.h"
27 #include <lavidlib/base/RuntimeException.h> 24 #include <lavidlib/base/RuntimeException.h>
28 25
29 -#define SERVICE_TYPE_CC 1 /* Closed Caption */ 26 +/*#define SERVICE_TYPE_CC 1 /* Closed Caption */
30 #define SERVICE_TYPE_SRT 2 /* Subtitle SRT */ 27 #define SERVICE_TYPE_SRT 2 /* Subtitle SRT */
31 #define SERVICE_TYPE_REC 3 /* Reconhecimento de Voz */ 28 #define SERVICE_TYPE_REC 3 /* Reconhecimento de Voz */
32 #define SERVICE_TYPE_TEXT 4 /* Texto */ 29 #define SERVICE_TYPE_TEXT 4 /* Texto */
servico/src/serviceWindowGeneration.cpp
@@ -179,7 +179,7 @@ void ServiceWindowGeneration::initialize() { @@ -179,7 +179,7 @@ void ServiceWindowGeneration::initialize() {
179 } 179 }
180 180
181 /* Se for SERVICE_TYPE_REC (Recognized) não é necessário usar o monitor_pcr_base */ 181 /* Se for SERVICE_TYPE_REC (Recognized) não é necessário usar o monitor_pcr_base */
182 - if (serviceType == SERVICE_TYPE_CC || serviceType == SERVICE_TYPE_SRT) { 182 + if (serviceType == SERVICE_TYPE_SRT) {
183 183
184 char* extensao = (char*) tokens[1].c_str(); 184 char* extensao = (char*) tokens[1].c_str();
185 this->monitor_pcr_base->extvideo = new char[strlen(extensao)]; 185 this->monitor_pcr_base->extvideo = new char[strlen(extensao)];
tradutor/src/include/tradutorPortGlosa.h
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 #include <pthread.h> 18 #include <pthread.h>
19 #include "ouvinteTradutor.h" 19 #include "ouvinteTradutor.h"
20 #include "pyTradutor.h" 20 #include "pyTradutor.h"
21 -#include "ouvinteCC.h"  
22 #include "ouvinteInput.h" 21 #include "ouvinteInput.h"
23 #include "dprintf.h" 22 #include "dprintf.h"
24 23
@@ -27,7 +26,7 @@ @@ -27,7 +26,7 @@
27 26
28 namespace Tradutor { 27 namespace Tradutor {
29 28
30 - class TradutorPortGlosa : public OuvinteInput, public OuvinteCC{ 29 + class TradutorPortGlosa : public OuvinteInput{
31 public: 30 public:
32 TradutorPortGlosa(); 31 TradutorPortGlosa();
33 virtual ~TradutorPortGlosa(); 32 virtual ~TradutorPortGlosa();
@@ -41,7 +40,7 @@ namespace Tradutor { @@ -41,7 +40,7 @@ namespace Tradutor {
41 40
42 void traduz(unsigned char * texto); 41 void traduz(unsigned char * texto);
43 virtual void chegouInput(unsigned char * texto); 42 virtual void chegouInput(unsigned char * texto);
44 - virtual void notificaCC(unsigned char * cc, int64_t pts); 43 + //virtual void notificaCC(unsigned char * cc, int64_t pts);
45 44
46 45
47 private: 46 private:
tradutor/src/tradutorPortGlosa.cpp
@@ -60,14 +60,14 @@ namespace Tradutor { @@ -60,14 +60,14 @@ namespace Tradutor {
60 } 60 }
61 } 61 }
62 62
63 - 63 + /*
64 // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC 64 // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC
65 void TradutorPortGlosa::notificaCC(unsigned char * cc, int64_t pts) { 65 void TradutorPortGlosa::notificaCC(unsigned char * cc, int64_t pts) {
66 // Mutex para evitar bug multiplas chamadas dos notificadores 66 // Mutex para evitar bug multiplas chamadas dos notificadores
67 pthread_mutex_lock(mutex); 67 pthread_mutex_lock(mutex);
68 traduz(cc); 68 traduz(cc);
69 pthread_mutex_unlock(mutex); 69 pthread_mutex_unlock(mutex);
70 - } 70 + }*/
71 71
72 // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC 72 // Implemento o metodo da classe que estou ouvindo, classe ExtratorCC
73 void TradutorPortGlosa::chegouInput(unsigned char * texto) { 73 void TradutorPortGlosa::chegouInput(unsigned char * texto) {