diff --git a/libremediaserver/doc/credits.txt b/libremediaserver/doc/credits.txt new file mode 100644 index 0000000..c48ff31 --- /dev/null +++ b/libremediaserver/doc/credits.txt @@ -0,0 +1,44 @@ +LibreMediaServer uses free soft from: + +Open Lightin Arquitecture - Copyright © Simon Newton + +ola2pd is a modification of ola_dmxmonitor. + +GEM - Graphics Environment for Multimedia +Copyright © 1997-2000 Mark Danks +Copyright © Günter Geiger +Copyright © 2001-2011 IOhannes m zmölnig, +Copyright © 2003-2007 James Tittle II, +Copyright © 2003-2008 Chris Clepper + +Pure Data +cyclone/coll.pd_linux +cyclone/counter.pd_linux +cyclone/gate.pd_linux + +Copyright © Miller Miller Puckette and others + +hcs/folderlist Copyright © Hans-Christoph Steiner + +expr.pd_linux Copyright © Shahrokh Yadegari + +pan/gpan~.pd Copyright © 2004 Marc Lavalee + +zexy/prepend.pd_linux +zexy/split.pd_linux +zexy/list2symbol.pd_linux + +Copyright 1999-2011 IOhannes m zmoelnig +contributions: +Copyright 1998-2004 matt wright +Copyright 1999-2000 winfried ritsch +Copyright 1999 guenter geiger +Copyright 1996-1999 miller s puckette +Copyright 2005-2006 tim blechmann +Copyright 2009-2010 franz zotter +Copyright 1999-2011 zexy-contributors + +pdogg~/oggread~.pd_linux Copyright © 2002-2004 by Olaf Matthes + +CITP Lib Copyright © 2009 John Warwick + diff --git a/libremediaserver/doc/todo.txt b/libremediaserver/doc/todo.txt index 1fd4ec6..f939256 100644 --- a/libremediaserver/doc/todo.txt +++ b/libremediaserver/doc/todo.txt @@ -37,6 +37,7 @@ Próximas versiones: - Audio: Tarjetas con varias salidas y varias mezclas. - Video: Live input - Empaquetar en .deb +- Opción en el arranque para mostrar las guis de Pure Data --> Optimización de patches y resolver errores ----------------- diff --git a/libremediaserver/libremediaserver.cpp b/libremediaserver/libremediaserver.cpp index 2ac3174..c53fe1d 100644 --- a/libremediaserver/libremediaserver.cpp +++ b/libremediaserver/libremediaserver.cpp @@ -1,6 +1,6 @@ /* Pure Media Server - A Media Server Sotfware for stage and performing - + v0.01-2 Copyright (C) 2012-2013 Santi Noreña libremediaserver@gmail.com This program is free software: you can redistribute it and/or modify @@ -30,13 +30,9 @@ #include #include #include -//#include -//#include -//#include // Esto habrá que cambiarlo para poder utilizar varias instancias #define PDPORTW 9195 -//#define PDPORTR 9196 ya no hace falta #define PDPORTW_AUDIO 9197 #define PDPORTR_AUDIO 9198 @@ -171,13 +167,27 @@ libreMediaServer::~libreMediaServer() if (m_pd_video != NULL) { disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart())); - m_pd_video->close(); + m_pd_video->terminate(); delete m_pd_video; } - m_ola->close(); - delete m_ola; + m_ola->close(); + delete m_ola; + if (m_pd_audio != NULL) + { + m_pd_audio->terminate(); + } + if (m_pd_write_audio != NULL) + { + m_pd_write_audio->close(); + delete m_pd_write_audio; + } + if (m_pd_write_audio != NULL) + { + m_pd_read_audio->close(); + } } + /////////////////////////////////////////////////////////////////// // File Configuration Stuff /////////////////////////////////////////////////////////////////// @@ -186,7 +196,7 @@ libreMediaServer::~libreMediaServer() void libreMediaServer::open() { - QFile file("pms.conf"); + QFile file("lms.conf"); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { qDebug()<<("Can not find the conf file"); @@ -328,7 +338,7 @@ void libreMediaServer::save() int offset = sizeof (struct conf) - 4; memcpy(buffer+offset, m_pathmedia.toAscii().constData(), m_pathmedia.size()); - QFile file("pms.conf"); + QFile file("lms.conf"); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { qDebug()<<("Can not open file pms.conf"); @@ -1334,6 +1344,20 @@ void libreMediaServer::on_audio_stateChanged(int state) disconnect(m_pd_audio, SIGNAL(finished(int)), this, SLOT(pdrestart_audio())); m_pd_audio->terminate(); m_pd_audio = NULL; + if (m_pd_write_audio != NULL) + { + disconnect(m_pd_write_audio, SIGNAL(connected()),this, SLOT(newconexion_audio())); + m_pd_write_audio->close(); + delete m_pd_write_audio; + m_pd_write_audio == NULL; + } + if (m_pd_write_audio != NULL) + { + disconnect(m_pd_read_audio, SIGNAL(newConnection()),this, SLOT(newPeer_audio())); + m_pd_read_audio->close(); + delete m_pd_read_audio; + m_pd_write_audio == NULL; + } } if ((state == 2)) { diff --git a/libremediaserver/libremediaserver.h b/libremediaserver/libremediaserver.h index f68134e..dac383c 100644 --- a/libremediaserver/libremediaserver.h +++ b/libremediaserver/libremediaserver.h @@ -38,7 +38,7 @@ public: libreMediaServer (QWidget *parent = 0); virtual ~libreMediaServer(); - Ui::PureMediaServer ui; + Ui::LibreMediaServer ui; protected: diff --git a/libremediaserver/libremediaserver.ui b/libremediaserver/libremediaserver.ui index 8e62ab6..f85f476 100644 --- a/libremediaserver/libremediaserver.ui +++ b/libremediaserver/libremediaserver.ui @@ -1105,7 +1105,7 @@ - LibreMediaServer 0.01-1 + LibreMediaServer 0.01-2 (C) 2012 Santiago Noreña libremediaserver@gmail.com This program comes with ABSOLUTELY NO WARRANTY