diff --git a/mixer/src/Mixer.cpp b/mixer/src/Mixer.cpp index abcd50d..0338612 100644 --- a/mixer/src/Mixer.cpp +++ b/mixer/src/Mixer.cpp @@ -29,10 +29,14 @@ Mixer::~Mixer() { /*Faz a chamada ffmpeg no terminal.*/ -void Mixer::initialize(string mainVideo, string slVideo, int positionSecondaryVideo, int sizeSecondaryVideo, int transparency){ +void Mixer::initialize(string mainVideo, string slVideo, int positionSecondaryVideo, int sizeSecondaryVideo, int transparency, char* _id){ DDPRINTF("[AGUARDE] Mixando...\n") + stringstream ss; + ss << _id; + ss >> this->user_id; + this->setMainVideo(mainVideo); this->setSecondaryVideo(slVideo); this->setNumThreads("8"); //tem que aparecer antes do metodo adjustVideosFps() @@ -308,7 +312,11 @@ void Mixer::setMainVideo(string mainVideo){ } //ajeitar isso depois string nameOfMainVideo = mainVideo.substr(0, dotPosition); - this->temporaryTextFile = "tamanho.txt"; + this->temporaryTextFile = "vlibras_user/vlibras-web/public/uploads/videos/"; + temporaryTextFile.append(this->user_id).append("/tamanho.txt"); + + printf("##########temporaryTextFile: %s\n", temporaryTextFile.c_str()); + } string Mixer::getMainVideo(){ return this->mainVideo; diff --git a/mixer/src/include/Mixer.h b/mixer/src/include/Mixer.h index 5325b25..1285db7 100644 --- a/mixer/src/include/Mixer.h +++ b/mixer/src/include/Mixer.h @@ -65,7 +65,7 @@ public: int getTransparency(); void setNumThreads(string); string getNumThreads(); - void initialize(string mainVideo, string slVideo, int, int, int); + void initialize(string mainVideo, string slVideo, int, int, int, char*); void setPathFinal(string path); string getPathFinal(); @@ -83,7 +83,7 @@ private: void convertMainVideoFPS(fpsAndLine [], int *); void convertSecondaryVideoFPS(double); - string mainVideo, secondaryVideo, temporaryTextFile, numThreads, pathFinal; + string mainVideo, secondaryVideo, temporaryTextFile, numThreads, pathFinal, user_id; int positionSecondaryVideo; double widthSecondaryVideo, heightSecondaryVideo; int transparency; diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp index d7d021c..36330dd 100644 --- a/servico/src/serviceWindowGeneration.cpp +++ b/servico/src/serviceWindowGeneration.cpp @@ -46,7 +46,7 @@ bool ServiceWindowGeneration::isRunning() { void ServiceWindowGeneration::finalizouSincronizacao() { if (getRunningOption() != '2' && serviceType != SERVICE_TYPE_TEXT && serviceType != SERVICE_TYPE_SRT_ONLY) { mixer = new Mixer(); - mixer->initialize(this->path_input, this->path_libras,this->position,this->size,this->transparency); + mixer->initialize(this->path_input, this->path_libras,this->position,this->size,this->transparency, this->user_id); sendFileToPath(mixer->getPathFinal()); } diff --git a/util/src/logger.cpp b/util/src/logger.cpp index afe9b4b..51d08dc 100644 --- a/util/src/logger.cpp +++ b/util/src/logger.cpp @@ -29,7 +29,7 @@ namespace Util { void Logger::openLogFile(){ - file.open("log/log.txt", ios_base::app); + file.open("vlibras_user/vlibras-core/log/log.txt", ios_base::app); } -- libgit2 0.21.2