- Modified log filename and folder.
This commit is contained in:
Santi Noreña
parent
4d31605318
commit
fdf73f25d5
8 changed files with 45 additions and 2378 deletions
38
credits.txt
38
credits.txt
|
|
@ -9,33 +9,27 @@ GEM - Graphics Environment for Multimedia. GPL License.
|
|||
- Copyright © 2001-2011 IOhannes m zmölnig,
|
||||
- Copyright © 2003-2007 James Tittle II,
|
||||
- Copyright © 2003-2008 Chris Clepper
|
||||
- pix2jpg is a modification of pix_write wich belongs to Gem package. GPL License.
|
||||
|
||||
pix2jpg is a modification of pix_write. GPL License.
|
||||
Pure Data, cyclone/coll, cyclone/counter, cyclone/gate: Copyright © Miller Miller Puckette and others - BSD License.
|
||||
|
||||
Pure Data - Copyright © Miller Miller Puckette and others - BSD License.
|
||||
cyclone/coll.pd_linux - Copyright © Miller Miller Puckette and others - BSD License.
|
||||
cyclone/counter.pd_linux - Copyright © Miller Miller Puckette and others - BSD License.
|
||||
cyclone/gate.pd_linux - Copyright © Miller Miller Puckette and others - BSD License.
|
||||
|
||||
hcs/folderlist - Copyright © Hans-Christoph Steiner - GPL License.
|
||||
hcs/folderlist: Copyright © Hans-Christoph Steiner - GPL License.
|
||||
- fileselector is a modification of folderlist. we are not using folderlist anymore.
|
||||
|
||||
expr.pd_linux - Copyright © Shahrokh Yadegari - GPL License.
|
||||
expr - Copyright © Shahrokh Yadegari - GPL License.
|
||||
|
||||
zexy/prepend.pd_linux
|
||||
zexy/split.pd_linux
|
||||
zexy/list2symbol.pd_linux
|
||||
zexy/prepend, zexy/split, zexy/list2symbol. GPL License.
|
||||
- Copyright 1999-2011 IOhannes m zmoelnig
|
||||
- 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
|
||||
|
||||
Copyright 1999-2011 IOhannes m zmoelnig - GPL License.
|
||||
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~: Copyright © 2002-2004 by Olaf Matthes - GPL License.
|
||||
|
||||
pdogg~/oggread~.pd_linux - Copyright © 2002-2004 by Olaf Matthes - GPL License.
|
||||
|
||||
CITP Lib Copyright - Copyright © 2009 John Warwick - MIT License. All the CITP/MSEx layer has been built on top of this library.
|
||||
CITP Lib: Copyright © 2009 John Warwick - MIT License. All the CITP/MSEx layer has been built on top of this library.
|
||||
|
||||
ImageMagick®, http://www.imagemagick.org. Copyright 1999-2013 ImageMagick Studio LLC. Apache License.
|
||||
|
|
|
|||
BIN
libremediaserver
BIN
libremediaserver
Binary file not shown.
2019
patches/log.txt
2019
patches/log.txt
File diff suppressed because it is too large
Load diff
317
src/Makefile
317
src/Makefile
|
|
@ -1,317 +0,0 @@
|
|||
#############################################################################
|
||||
# Makefile for building: debug/libremediaserver
|
||||
# Generated by qmake (2.01a) (Qt 4.8.2) on: dom feb 24 12:33:27 2013
|
||||
# Project: libremediaserver.pro
|
||||
# Template: app
|
||||
# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile libremediaserver.pro
|
||||
#############################################################################
|
||||
|
||||
####### Compiler, tools and options
|
||||
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
DEFINES = -DQT_WEBKIT -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
|
||||
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
|
||||
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
|
||||
INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtScript -I/usr/include/qt4 -I. -I.
|
||||
LINK = g++
|
||||
LFLAGS =
|
||||
LIBS = $(SUBLIBS) -L/usr/lib/i386-linux-gnu -L./debug -lQtScript -lQtGui -lQtNetwork -lQtCore -lpthread
|
||||
AR = ar cqs
|
||||
RANLIB =
|
||||
QMAKE = /usr/bin/qmake-qt4
|
||||
TAR = tar -cf
|
||||
COMPRESS = gzip -9f
|
||||
COPY = cp -f
|
||||
SED = sed
|
||||
COPY_FILE = $(COPY)
|
||||
COPY_DIR = $(COPY) -r
|
||||
STRIP = strip
|
||||
INSTALL_FILE = install -m 644 -p
|
||||
INSTALL_DIR = $(COPY_DIR)
|
||||
INSTALL_PROGRAM = install -m 755 -p
|
||||
DEL_FILE = rm -f
|
||||
SYMLINK = ln -f -s
|
||||
DEL_DIR = rmdir
|
||||
MOVE = mv -f
|
||||
CHK_DIR_EXISTS= test -d
|
||||
MKDIR = mkdir -p
|
||||
|
||||
####### Output directory
|
||||
|
||||
OBJECTS_DIR = ./
|
||||
|
||||
####### Files
|
||||
|
||||
SOURCES = main.cpp \
|
||||
libremediaserver.cpp \
|
||||
citp-lib.cpp \
|
||||
PacketCreator.cpp \
|
||||
PeerInformationSocket.cpp \
|
||||
msex.cpp moc_libremediaserver.cpp \
|
||||
moc_citp-lib.cpp \
|
||||
moc_PacketCreator.cpp \
|
||||
moc_PeerInformationSocket.cpp \
|
||||
moc_msex.cpp
|
||||
OBJECTS = main.o \
|
||||
libremediaserver.o \
|
||||
citp-lib.o \
|
||||
PacketCreator.o \
|
||||
PeerInformationSocket.o \
|
||||
msex.o \
|
||||
moc_libremediaserver.o \
|
||||
moc_citp-lib.o \
|
||||
moc_PacketCreator.o \
|
||||
moc_PeerInformationSocket.o \
|
||||
moc_msex.o
|
||||
DIST = /usr/share/qt4/mkspecs/common/unix.conf \
|
||||
/usr/share/qt4/mkspecs/common/linux.conf \
|
||||
/usr/share/qt4/mkspecs/common/gcc-base.conf \
|
||||
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf \
|
||||
/usr/share/qt4/mkspecs/common/g++-base.conf \
|
||||
/usr/share/qt4/mkspecs/common/g++-unix.conf \
|
||||
/usr/share/qt4/mkspecs/qconfig.pri \
|
||||
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
|
||||
/usr/share/qt4/mkspecs/features/qt_functions.prf \
|
||||
/usr/share/qt4/mkspecs/features/qt_config.prf \
|
||||
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
|
||||
/usr/share/qt4/mkspecs/features/default_pre.prf \
|
||||
/usr/share/qt4/mkspecs/features/debug.prf \
|
||||
/usr/share/qt4/mkspecs/features/default_post.prf \
|
||||
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
|
||||
/usr/share/qt4/mkspecs/features/warn_on.prf \
|
||||
/usr/share/qt4/mkspecs/features/qt.prf \
|
||||
/usr/share/qt4/mkspecs/features/unix/thread.prf \
|
||||
/usr/share/qt4/mkspecs/features/moc.prf \
|
||||
/usr/share/qt4/mkspecs/features/resources.prf \
|
||||
/usr/share/qt4/mkspecs/features/uic.prf \
|
||||
/usr/share/qt4/mkspecs/features/yacc.prf \
|
||||
/usr/share/qt4/mkspecs/features/lex.prf \
|
||||
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
|
||||
libremediaserver.pro
|
||||
QMAKE_TARGET = libremediaserver
|
||||
DESTDIR = debug/
|
||||
TARGET = debug/libremediaserver
|
||||
|
||||
first: all
|
||||
####### Implicit rules
|
||||
|
||||
.SUFFIXES: .o .c .cpp .cc .cxx .C
|
||||
|
||||
.cpp.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
|
||||
|
||||
.cc.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
|
||||
|
||||
.cxx.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
|
||||
|
||||
.C.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
|
||||
|
||||
####### Build rules
|
||||
|
||||
all: Makefile $(TARGET)
|
||||
|
||||
$(TARGET): ui_libremediaserver.h $(OBJECTS)
|
||||
@$(CHK_DIR_EXISTS) debug/ || $(MKDIR) debug/
|
||||
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
|
||||
{ test -n "$(DESTDIR)" && DESTDIR="$(DESTDIR)" || DESTDIR=.; } && test $$(gdb --version | sed -e 's,[^0-9]\+\([0-9]\)\.\([0-9]\).*,\1\2,;q') -gt 72 && gdb --nx --batch --quiet -ex 'set confirm off' -ex "save gdb-index $$DESTDIR" -ex quit '$(TARGET)' && test -f $(TARGET).gdb-index && objcopy --add-section '.gdb_index=$(TARGET).gdb-index' --set-section-flags '.gdb_index=readonly' '$(TARGET)' '$(TARGET)' && rm -f $(TARGET).gdb-index || true
|
||||
|
||||
Makefile: libremediaserver.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \
|
||||
/usr/share/qt4/mkspecs/common/linux.conf \
|
||||
/usr/share/qt4/mkspecs/common/gcc-base.conf \
|
||||
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf \
|
||||
/usr/share/qt4/mkspecs/common/g++-base.conf \
|
||||
/usr/share/qt4/mkspecs/common/g++-unix.conf \
|
||||
/usr/share/qt4/mkspecs/qconfig.pri \
|
||||
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
|
||||
/usr/share/qt4/mkspecs/features/qt_functions.prf \
|
||||
/usr/share/qt4/mkspecs/features/qt_config.prf \
|
||||
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
|
||||
/usr/share/qt4/mkspecs/features/default_pre.prf \
|
||||
/usr/share/qt4/mkspecs/features/debug.prf \
|
||||
/usr/share/qt4/mkspecs/features/default_post.prf \
|
||||
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
|
||||
/usr/share/qt4/mkspecs/features/warn_on.prf \
|
||||
/usr/share/qt4/mkspecs/features/qt.prf \
|
||||
/usr/share/qt4/mkspecs/features/unix/thread.prf \
|
||||
/usr/share/qt4/mkspecs/features/moc.prf \
|
||||
/usr/share/qt4/mkspecs/features/resources.prf \
|
||||
/usr/share/qt4/mkspecs/features/uic.prf \
|
||||
/usr/share/qt4/mkspecs/features/yacc.prf \
|
||||
/usr/share/qt4/mkspecs/features/lex.prf \
|
||||
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
|
||||
/usr/lib/i386-linux-gnu/libQtScript.prl \
|
||||
/usr/lib/i386-linux-gnu/libQtGui.prl \
|
||||
/usr/lib/i386-linux-gnu/libQtNetwork.prl \
|
||||
/usr/lib/i386-linux-gnu/libQtCore.prl
|
||||
$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile libremediaserver.pro
|
||||
/usr/share/qt4/mkspecs/common/unix.conf:
|
||||
/usr/share/qt4/mkspecs/common/linux.conf:
|
||||
/usr/share/qt4/mkspecs/common/gcc-base.conf:
|
||||
/usr/share/qt4/mkspecs/common/gcc-base-unix.conf:
|
||||
/usr/share/qt4/mkspecs/common/g++-base.conf:
|
||||
/usr/share/qt4/mkspecs/common/g++-unix.conf:
|
||||
/usr/share/qt4/mkspecs/qconfig.pri:
|
||||
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
|
||||
/usr/share/qt4/mkspecs/features/qt_functions.prf:
|
||||
/usr/share/qt4/mkspecs/features/qt_config.prf:
|
||||
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
|
||||
/usr/share/qt4/mkspecs/features/default_pre.prf:
|
||||
/usr/share/qt4/mkspecs/features/debug.prf:
|
||||
/usr/share/qt4/mkspecs/features/default_post.prf:
|
||||
/usr/share/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
|
||||
/usr/share/qt4/mkspecs/features/warn_on.prf:
|
||||
/usr/share/qt4/mkspecs/features/qt.prf:
|
||||
/usr/share/qt4/mkspecs/features/unix/thread.prf:
|
||||
/usr/share/qt4/mkspecs/features/moc.prf:
|
||||
/usr/share/qt4/mkspecs/features/resources.prf:
|
||||
/usr/share/qt4/mkspecs/features/uic.prf:
|
||||
/usr/share/qt4/mkspecs/features/yacc.prf:
|
||||
/usr/share/qt4/mkspecs/features/lex.prf:
|
||||
/usr/share/qt4/mkspecs/features/include_source_dir.prf:
|
||||
/usr/lib/i386-linux-gnu/libQtScript.prl:
|
||||
/usr/lib/i386-linux-gnu/libQtGui.prl:
|
||||
/usr/lib/i386-linux-gnu/libQtNetwork.prl:
|
||||
/usr/lib/i386-linux-gnu/libQtCore.prl:
|
||||
qmake: FORCE
|
||||
@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile libremediaserver.pro
|
||||
|
||||
dist:
|
||||
@$(CHK_DIR_EXISTS) .tmp/libremediaserver1.0.0 || $(MKDIR) .tmp/libremediaserver1.0.0
|
||||
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/libremediaserver1.0.0/ && $(COPY_FILE) --parents libremediaserver.h citp-lib.h PacketCreator.h PeerInformationSocket.h msex.h CITPDefines.h MSEXDefines.h .tmp/libremediaserver1.0.0/ && $(COPY_FILE) --parents main.cpp libremediaserver.cpp citp-lib.cpp PacketCreator.cpp PeerInformationSocket.cpp msex.cpp .tmp/libremediaserver1.0.0/ && $(COPY_FILE) --parents libremediaserver.ui .tmp/libremediaserver1.0.0/ && (cd `dirname .tmp/libremediaserver1.0.0` && $(TAR) libremediaserver1.0.0.tar libremediaserver1.0.0 && $(COMPRESS) libremediaserver1.0.0.tar) && $(MOVE) `dirname .tmp/libremediaserver1.0.0`/libremediaserver1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/libremediaserver1.0.0
|
||||
|
||||
|
||||
clean:compiler_clean
|
||||
-$(DEL_FILE) $(OBJECTS)
|
||||
-$(DEL_FILE) *~ core *.core
|
||||
|
||||
|
||||
####### Sub-libraries
|
||||
|
||||
distclean: clean
|
||||
-$(DEL_FILE) $(TARGET)
|
||||
-$(DEL_FILE) Makefile
|
||||
|
||||
|
||||
check: first
|
||||
|
||||
mocclean: compiler_moc_header_clean compiler_moc_source_clean
|
||||
|
||||
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
|
||||
|
||||
compiler_moc_header_make_all: moc_libremediaserver.cpp moc_citp-lib.cpp moc_PacketCreator.cpp moc_PeerInformationSocket.cpp moc_msex.cpp
|
||||
compiler_moc_header_clean:
|
||||
-$(DEL_FILE) moc_libremediaserver.cpp moc_citp-lib.cpp moc_PacketCreator.cpp moc_PeerInformationSocket.cpp moc_msex.cpp
|
||||
moc_libremediaserver.cpp: msex.h \
|
||||
MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
ui_libremediaserver.h \
|
||||
libremediaserver.h
|
||||
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) libremediaserver.h -o moc_libremediaserver.cpp
|
||||
|
||||
moc_citp-lib.cpp: citp-lib.h
|
||||
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) citp-lib.h -o moc_citp-lib.cpp
|
||||
|
||||
moc_PacketCreator.cpp: MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
PacketCreator.h
|
||||
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) PacketCreator.h -o moc_PacketCreator.cpp
|
||||
|
||||
moc_PeerInformationSocket.cpp: PeerInformationSocket.h
|
||||
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) PeerInformationSocket.h -o moc_PeerInformationSocket.cpp
|
||||
|
||||
moc_msex.cpp: MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
msex.h
|
||||
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) msex.h -o moc_msex.cpp
|
||||
|
||||
compiler_rcc_make_all:
|
||||
compiler_rcc_clean:
|
||||
compiler_image_collection_make_all: qmake_image_collection.cpp
|
||||
compiler_image_collection_clean:
|
||||
-$(DEL_FILE) qmake_image_collection.cpp
|
||||
compiler_moc_source_make_all:
|
||||
compiler_moc_source_clean:
|
||||
compiler_uic_make_all: ui_libremediaserver.h
|
||||
compiler_uic_clean:
|
||||
-$(DEL_FILE) ui_libremediaserver.h
|
||||
ui_libremediaserver.h: libremediaserver.ui
|
||||
/usr/bin/uic-qt4 libremediaserver.ui -o ui_libremediaserver.h
|
||||
|
||||
compiler_yacc_decl_make_all:
|
||||
compiler_yacc_decl_clean:
|
||||
compiler_yacc_impl_make_all:
|
||||
compiler_yacc_impl_clean:
|
||||
compiler_lex_make_all:
|
||||
compiler_lex_clean:
|
||||
compiler_clean: compiler_moc_header_clean compiler_uic_clean
|
||||
|
||||
####### Compile
|
||||
|
||||
main.o: main.cpp libremediaserver.h \
|
||||
msex.h \
|
||||
MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
ui_libremediaserver.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
|
||||
|
||||
libremediaserver.o: libremediaserver.cpp libremediaserver.h \
|
||||
msex.h \
|
||||
MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
ui_libremediaserver.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o libremediaserver.o libremediaserver.cpp
|
||||
|
||||
citp-lib.o: citp-lib.cpp citp-lib.h \
|
||||
CITPDefines.h \
|
||||
PeerInformationSocket.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o citp-lib.o citp-lib.cpp
|
||||
|
||||
PacketCreator.o: PacketCreator.cpp PacketCreator.h \
|
||||
MSEXDefines.h \
|
||||
CITPDefines.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o PacketCreator.o PacketCreator.cpp
|
||||
|
||||
PeerInformationSocket.o: PeerInformationSocket.cpp PeerInformationSocket.h \
|
||||
citp-lib.h \
|
||||
CITPDefines.h \
|
||||
PacketCreator.h \
|
||||
MSEXDefines.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o PeerInformationSocket.o PeerInformationSocket.cpp
|
||||
|
||||
msex.o: msex.cpp msex.h \
|
||||
MSEXDefines.h \
|
||||
CITPDefines.h \
|
||||
PacketCreator.h \
|
||||
citp-lib.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o msex.o msex.cpp
|
||||
|
||||
moc_libremediaserver.o: moc_libremediaserver.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_libremediaserver.o moc_libremediaserver.cpp
|
||||
|
||||
moc_citp-lib.o: moc_citp-lib.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_citp-lib.o moc_citp-lib.cpp
|
||||
|
||||
moc_PacketCreator.o: moc_PacketCreator.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_PacketCreator.o moc_PacketCreator.cpp
|
||||
|
||||
moc_PeerInformationSocket.o: moc_PeerInformationSocket.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_PeerInformationSocket.o moc_PeerInformationSocket.cpp
|
||||
|
||||
moc_msex.o: moc_msex.cpp
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_msex.o moc_msex.cpp
|
||||
|
||||
####### Install
|
||||
|
||||
install: FORCE
|
||||
|
||||
uninstall: FORCE
|
||||
|
||||
FORCE:
|
||||
|
||||
|
|
@ -18,20 +18,6 @@
|
|||
*/
|
||||
|
||||
#include "libremediaserver.h"
|
||||
#include "CITPDefines.h"
|
||||
#include "MSEXDefines.h"
|
||||
#include "msex.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtDebug>
|
||||
#include <QtNetwork>
|
||||
#include <QFileInfo>
|
||||
#include <QFileDialog>
|
||||
#include <QLocalServer>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
|
||||
// Esto habrá que cambiarlo para poder utilizar varias instancias
|
||||
#define PDPORTW 9195
|
||||
|
|
@ -39,7 +25,7 @@
|
|||
#define PDPORTW_AUDIO 9197
|
||||
#define PDPORTR_AUDIO 9198
|
||||
|
||||
#define SOCKET "/tmp/pmspipe" // Pipe wicho PD sends the files for preview in the GUI
|
||||
#define SOCKET "/tmp/pmspipe" // Pipe wich PD sends the files for preview in the GUI
|
||||
|
||||
#define CONF_FILE "lms.conf" // File when save/restore the configuration on exit/open
|
||||
|
||||
|
|
@ -105,6 +91,8 @@ bool audioCheck;
|
|||
// Constructor
|
||||
///////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
libreMediaServer::libreMediaServer(QWidget *parent)
|
||||
: QMainWindow(parent),
|
||||
m_startvideo(0),
|
||||
|
|
@ -851,13 +839,12 @@ void libreMediaServer::pdstart()
|
|||
{
|
||||
return;
|
||||
}
|
||||
qDebug()<<"Starting PD Video:" << ++m_startvideo;
|
||||
// Creamos los sockets para la conexión a Pure Data
|
||||
m_pd_write_video = new QTcpSocket(this);
|
||||
Q_CHECK_PTR(m_pd_write_video);
|
||||
connect(m_pd_write_video, SIGNAL(connected()),this, SLOT(newconexion()));
|
||||
// Arrancamos el proceso Pure Data
|
||||
m_pd_video->start("./pd -noaudio -lib Gem -stderr -nostdpath -path ./externals/ lms-video.pd");
|
||||
m_pd_video->start("./pd -noaudio -lib Gem -stderr -nostdpath -path ./externals/ ./patches/lms-video.pd");
|
||||
if (m_pd_video->waitForStarted(3000)){
|
||||
ui.textEdit->appendPlainText("Video Engine started.");
|
||||
}
|
||||
|
|
@ -881,6 +868,7 @@ void libreMediaServer::pdrestart()
|
|||
return;
|
||||
}
|
||||
save_finish();
|
||||
qDebug()<<"Starting PD Video:" << ++m_startvideo;
|
||||
ui.textEdit->appendPlainText("PD Video Restarting.");
|
||||
disconnect(m_pd_video, SIGNAL(finished(int)), this, SLOT(pdrestart()));
|
||||
pdstart();
|
||||
|
|
@ -1358,7 +1346,6 @@ void libreMediaServer::pdstart_audio()
|
|||
{
|
||||
return;
|
||||
}
|
||||
qDebug()<<"Starting PD Audio:" << ++m_startaudio;
|
||||
// Creamos los sockets para la conexión a Pure Data
|
||||
m_pd_write_audio = new QTcpSocket(this);
|
||||
Q_CHECK_PTR(m_pd_write_audio);
|
||||
|
|
@ -1375,7 +1362,7 @@ void libreMediaServer::pdstart_audio()
|
|||
qDebug()<<"error listening tcpServer";
|
||||
}
|
||||
// Arrancamos el proceso Pure Data
|
||||
m_pd_audio->start("./pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./externals/ lms-audio.pd");
|
||||
m_pd_audio->start("./pd -alsa -channels 2 -audiodev 1 -stderr -nostdpath -path ./externals/ ./patches/lms-audio.pd");
|
||||
if (m_pd_audio->waitForStarted(3000)){
|
||||
ui.textEdit->appendPlainText("PD Audio started.");
|
||||
}
|
||||
|
|
@ -1392,6 +1379,7 @@ void libreMediaServer::pdstart_audio()
|
|||
void libreMediaServer::pdrestart_audio()
|
||||
{
|
||||
save_finish();
|
||||
qDebug()<<"Starting PD Audio:" << ++m_startaudio;
|
||||
ui.textEdit->appendPlainText("PD audio Restarting...");
|
||||
if (m_pd_audio->state())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,9 +21,21 @@
|
|||
|
||||
#include <QMainWindow>
|
||||
#include "msex.h"
|
||||
#include "CITPDefines.h"
|
||||
#include "MSEXDefines.h"
|
||||
#include "ui_libremediaserver.h"
|
||||
|
||||
#include <QtNetwork>
|
||||
#include <QLocalServer>
|
||||
#include <QLocalSocket>
|
||||
#include <QObject>
|
||||
#include <QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtDebug>
|
||||
#include <QFileInfo>
|
||||
#include <QFileDialog>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
|
||||
class msex;
|
||||
class QMenu;
|
||||
|
|
@ -73,6 +85,7 @@ private:
|
|||
void save_finish();
|
||||
void open(QFile *file);
|
||||
void save(QFile *file);
|
||||
// void MessageHandler(QtMsgType type, const char *msg);
|
||||
|
||||
public slots:
|
||||
|
||||
|
|
|
|||
10
src/main.cpp
10
src/main.cpp
|
|
@ -19,6 +19,7 @@
|
|||
#include <QApplication>
|
||||
#include "libremediaserver.h"
|
||||
|
||||
// Handler for pipe the stderr to a log file
|
||||
void MessageHandler(QtMsgType type, const char *msg)
|
||||
{
|
||||
QString txt;
|
||||
|
|
@ -36,7 +37,14 @@ void MessageHandler(QtMsgType type, const char *msg)
|
|||
txt = QString("Fatal: %1").arg(msg);
|
||||
abort();
|
||||
}
|
||||
QFile outFile("log.txt");
|
||||
QString filename;
|
||||
QDate date = QDate::currentDate();
|
||||
QTime time = QTime::currentTime();
|
||||
filename.append("./logs/log_");
|
||||
filename.append(date.toString("dd_MM_yy-"));
|
||||
filename.append(time.toString("hh-mm-ss"));
|
||||
filename.append(".txt");
|
||||
QFile outFile(filename);
|
||||
outFile.open(QIODevice::WriteOnly | QIODevice::Append);
|
||||
QTextStream ts(&outFile);
|
||||
ts << txt << endl;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue