diff --git a/Makefile b/Makefile
index 4177880..45046b2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ 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 xml/src/include \
+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
@@ -53,10 +53,6 @@ extratorTXT_exception.o
monitorPCRObjs = \
monitor_pcr.o
-xmlObjs = \
-receiveXml.o \
-readXml.o
-
codificadorObjs = \
crc32.o \
inmanagementdata.o \
@@ -105,7 +101,6 @@ extratorCCObjsPre = $(addprefix extratorCC/src/,$(extratorCCObjs) )
codificadorObjsPre = $(addprefix codificador/src/,$(codificadorObjs) )
inputObjsPre = $(addprefix input/src/,$(inputObjs) )
demuxObjsPre = $(addprefix demux/src/,$(demuxObjs) )
-xmlObjsPre = $(addprefix xml/src/,$(xmlObjs) )
servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) )
mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
@@ -114,7 +109,7 @@ monitorPCRObjsPre = $(addprefix monitorPCR/src/,$(monitorPCRObjs) )
recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
-OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorCCObjsPre) $(extratorTXTObjsPre) $(codificadorObjsPre) $(inputObjsPre) $(demuxObjsPre) $(xmlObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o
+OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorCCObjsPre) $(extratorTXTObjsPre) $(codificadorObjsPre) $(inputObjsPre) $(demuxObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o
all: user_config libras
diff --git a/data/configuracoes.xml b/data/configuracoes.xml
deleted file mode 100644
index 3321af5..0000000
--- a/data/configuracoes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- 99
- 1920x1080
-
- 170
- 220
- 640
- 270
-
- 2
- 278
-
- 12345
-
-
- 150.165.132.145
- 4001
-
-
diff --git a/data/runningoption.xml b/data/runningoption.xml
deleted file mode 100644
index 29ac6fa..0000000
--- a/data/runningoption.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-1
-
-## Colocar no início do arquivo a opção de execução desejada.
-## Opções:
-## 1: Todo o projeto
-## 2: Executar sem mixagem
-## 3: Executar sem tradutor
-## 4 - : Uso futuro
diff --git a/log/log b/log/log
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/log/log
diff --git a/runningoption.xml b/runningoption.xml
new file mode 100644
index 0000000..29ac6fa
--- /dev/null
+++ b/runningoption.xml
@@ -0,0 +1,8 @@
+1
+
+## Colocar no início do arquivo a opção de execução desejada.
+## Opções:
+## 1: Todo o projeto
+## 2: Executar sem mixagem
+## 3: Executar sem tradutor
+## 4 - : Uso futuro
diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp
index 63dcfa6..d2e7ea2 100644
--- a/servico/src/serviceWindowGeneration.cpp
+++ b/servico/src/serviceWindowGeneration.cpp
@@ -59,7 +59,7 @@ void ServiceWindowGeneration::finalizouSincronizacao() {
char ServiceWindowGeneration::getRunningOption() {
char option;
if(!option){
- int file_d = open("vlibras_user/vlibras-core/data/runningoption.xml", O_RDONLY);
+ int file_d = open("vlibras_user/vlibras-core/runningoption.xml", O_RDONLY);
int cont = read(file_d, &option, 1);
close(file_d);
}
diff --git a/util/src/logger.cpp b/util/src/logger.cpp
index 51d08dc..ae805fb 100644
--- a/util/src/logger.cpp
+++ b/util/src/logger.cpp
@@ -29,7 +29,7 @@ namespace Util {
void Logger::openLogFile(){
- file.open("vlibras_user/vlibras-core/log/log.txt", ios_base::app);
+ file.open("vlibras_user/vlibras-core/log/log", ios_base::app);
}
diff --git a/xml/src/include/readXml.h b/xml/src/include/readXml.h
deleted file mode 100644
index 1ed1998..0000000
--- a/xml/src/include/readXml.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * File: lerXml.h
- * Author: felipe
- *
- * Created on 29 de Março de 2010, 15:52
- */
-
-#ifndef _LERXML_H
-#define _LERXML_H
-
-#include
-#include "jxmlparser.h"
-
-using namespace std;
-using namespace jcommon;
-
-class ReadXml {
-private:
- string pid, resolucao, DPH, DPV, DFW, DFH, versao, pidCC, porta, tipo, portaOut, ip;
- XmlDocument doc;
- bool regrasCarregadas;
- XmlElement *inicioRegraAtual;
- int profundidadeRegraAtual;
- int contZerado;
- vector < XmlElement * > *rulesAtual;
-
-public:
- ReadXml();
- virtual ~ReadXml();
-
- int getPid();
- int getDPH();
- int getDPV();
- int getDFW();
- int getDFH();
- int getVersao();
- int getPidCC();
- string getTipo();
- int getPorta();
- string getResolucao();
- int getPortaOut();
- string getIp();
-
- void Leitura();
- int setProfundidade(int p);
-};
-
-#endif /* _LERXML_H */
-
diff --git a/xml/src/include/receiveXml.h b/xml/src/include/receiveXml.h
deleted file mode 100644
index 4f98cd6..0000000
--- a/xml/src/include/receiveXml.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _RECEIVE_H_
-#define _RECEIVE_H_
-
-#include "jthread.h"
-
-class ReceiveXml: public jthread::Thread {
-private:
- int flag;
-
-public:
- static const int MAX_CC_MSG = 1316;
-
- ReceiveXml();
- virtual ~ReceiveXml();
-
- int GetFlagControle();
- void SetFlagControle(int k);
- void Run();
-
-};
-
-#endif
\ No newline at end of file
diff --git a/xml/src/readXml.cpp b/xml/src/readXml.cpp
deleted file mode 100644
index 68c5273..0000000
--- a/xml/src/readXml.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * File: lerXml.cpp
- * Author: felipe
- *
- * Created on 29 de Março de 2010, 15:52
- */
-
-#include
-#include
-#include
-#include
-#include
-
-#include "readXml.h"
-#include
-
-ReadXml::ReadXml() {
- regrasCarregadas = false;
- profundidadeRegraAtual = 0;
- inicioRegraAtual = NULL;
- rulesAtual = new vector < XmlElement *> ();
-}
-
-ReadXml::~ReadXml() {
- rulesAtual->clear();
- delete rulesAtual;
-}
-
-void ReadXml::Leitura() {
- string str;
- XmlElement * tmp;
- XmlAttribute * atr;
-
- //arq = fopen("/home/felipe/Python/arquivo_dados.txt", "w");
- XmlDocument doc("vlibras_user/vlibras-core/data/configuracoes.xml");
-
- if (!doc.LoadFile()) {
- printf("Erro ao carregar o XML das aplicacoes -> %s\n", doc.ErrorDesc());
-
- }
-
- XmlElement *xml = doc.RootElement()->FirstChildElement("pid");
- pid = xml->GetText();
- //cout << "pid: " << pid << endl;
-
- xml = xml->NextSiblingElement();
- resolucao = xml->GetText();
-
- //cout << "Resolucao: " << resolucao << endl;
-
- xml = xml->NextSiblingElement();
-
- tmp = xml->FirstChildElement();
- DPH = tmp->GetText();
-
- //cout << "DPH: " << DPH << endl;
-
- tmp = tmp->NextSiblingElement();
- DPV = tmp->GetText();
-
- //cout << "DPV: " << DPV << endl;
-
- tmp = tmp->NextSiblingElement();
- DFW = tmp->GetText();
-
- //cout << "DFW: " << DFW << endl;
-
- tmp = tmp->NextSiblingElement();
- DFH = tmp->GetText();
-
- //cout << "DFH: " << DFH << endl;
-
- xml = xml->NextSiblingElement();
- versao = xml->GetText();
-
- //cout << "Versao: " << versao << endl;
-
- xml = xml->NextSiblingElement();
- str = xml->Value();
-
- if (str.compare("pidCC") == 0) {
- pidCC = xml->GetText();
- //cout << "PidCC: " << pidCC << endl;
- xml = xml->NextSiblingElement();
- }
- str = xml->Value();
- atr = xml->FirstAttribute();
- tipo = atr->Value();
-
- if (tipo.compare("MPEG-2 TS") == 0) {
- //cout << "Tipo: " << tipo << endl;
-
- tmp = xml->FirstChildElement();
- atr = tmp->FirstAttribute();
- tipo = atr->Value();
- porta = tmp->GetText();
- //cout << "Porta: " << porta << endl;
- //cout << "Tipo: " << tipo << endl;
-
- }
-
- if (tipo.compare("RAW") == 0) {
-
- tmp = xml->FirstChildElement();
-
- porta = tmp->GetText();
- //cout << "Porta: " << porta << endl;
- //cout << "Tipo: " << tipo << endl;
-
- }
-
- //cout << "Tipo: " << tipo << endl;
-
- xml = xml->NextSiblingElement();
- tmp = xml->FirstChildElement();
- ip = tmp->GetText();
-
- //cout << "IP: " << ip << endl;
-
- tmp = tmp->NextSiblingElement();
- portaOut = tmp->GetText();
-
- //cout << "Porta: " << portaOut << endl;
-}
-
-int ReadXml::getPid() {
- stringstream st;
- int p;
-
- st << pid << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getDPH() {
- stringstream st;
- int p;
-
- st << DPH << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getDPV() {
- stringstream st;
- int p;
-
- st << DPV << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getDFW() {
- stringstream st;
- int p;
-
- st << DFW << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getDFH() {
- stringstream st;
- int p;
-
- st << DFH << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getVersao() {
- stringstream st;
- int p;
-
- st << versao << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getPidCC() {
- stringstream st;
- int p;
-
- st << pidCC << endl;
- st >> p;
-
- return p;
-}
-
-int ReadXml::getPorta() {
- stringstream st;
- int p;
- //cout << "Porta convertida: " << porta << endl;
- st << porta << endl;
- st >> p;
-
- //cout << "Porta convertida: " << p << endl;
- return p;
-}
-
-string ReadXml::getTipo() {
- return tipo;
-}
-
-string ReadXml::getResolucao() {
- return resolucao;
-}
-
-int ReadXml::getPortaOut() {
- stringstream st;
- int p;
-
- st << portaOut << endl;
- st >> p;
-
- return p;
-}
-
-string ReadXml::getIp() {
- return ip;
-}
-
-int ReadXml::setProfundidade(int p){
- profundidadeRegraAtual = p;
-
-}
-
-/*
- * aplicarRule - metodo para aplicar a regra correta para a sequencia
- * atual de glosas
- *
- * Params:
- * frase - vetor contendo a frase completa
- * posInicial - indicacao do inicio do trecho onde a regra sera aplicada
- *
- * Ultima modificacao: 17/03/2011
- */
-
-
diff --git a/xml/src/receiveXml.cpp b/xml/src/receiveXml.cpp
deleted file mode 100644
index 877cbab..0000000
--- a/xml/src/receiveXml.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include
-#include
-#include "receiveXml.h"
-
-#include "jdatagramsocket.h"
-
-using namespace std;
-using namespace jsocket;
-
-ReceiveXml::ReceiveXml() {
- flag = 0;
-
-}
-
-ReceiveXml::~ReceiveXml() {
-
-}
-
-int ReceiveXml::GetFlagControle() {
- return flag;
-}
-
-void ReceiveXml::SetFlagControle(int k) {
- flag = k;
-}
-
-void ReceiveXml::Run() {
-
- int porta = 1234, readed;
- unsigned char buffer[100000];
-
- DatagramSocket * r_socket = new DatagramSocket(porta);
- printf(" => Servidor ligado aguardado pacote...\n");
- while (1) {
- readed = r_socket->Receive((char*) buffer, 1);
-
- if (buffer[0] == 1) {
-
- readed = r_socket->Receive((char*) buffer, 100000);
- flag = 1;
-
- ofstream os("vlibras_user/vlibras-core/data/configuracoes.xml", ios::binary);
- os.write((char*) buffer, readed);
- }
- if (buffer[0] == 2) {
- //printf("Aki: %d", buffer[0]);
- flag = 2;
- }
- }
-
- r_socket->Close();
-
- delete r_socket;
-}
--
libgit2 0.21.2