From 5fffda62b4557bf998ea80b985e384fc94590be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20Nore=C3=B1a?= Date: Tue, 23 Apr 2013 15:47:47 +0200 Subject: [PATCH 1/3] - Release v0.04 --- changelog.txt | 7 +++++++ scripts/install_squeeze.sh | 28 ---------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100755 scripts/install_squeeze.sh diff --git a/changelog.txt b/changelog.txt index 1ba04d6..b2b332d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -23,6 +23,13 @@ Lbre Media Server ChangeLog ******************************************************************************* +V 0.04: + ++ GUI: added FPS counter ++ GUI: added FPS selector ++ Added folders to fonts ++ Video: Live camera input + v 0.03: - Added -log option to command line to write to a textfile the debug info. The logs file are in the folder ./log and have the format log_DDMMYY-HHMMSS.txt where DD day, MM month, YY year, HH hours, MM minutes SS seconds of the time when libremediaserver opens. - Added option -gui in command line to show the Pure Data GUI's diff --git a/scripts/install_squeeze.sh b/scripts/install_squeeze.sh deleted file mode 100755 index ddaabeb..0000000 --- a/scripts/install_squeeze.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -############################################################################## -# Script de instalación de las dependencias de Pure Media Server -# en Debian Squeeze. -# Necesita root para ejecutar -# (c) 2012 Santi Noreña -# GPL License -############################################################################### -# Comprobamos root -(( EUID )) && echo ‘You need to be root.’ && exit 1 -# Instalamos OLA desde el repositorio del proyecto -# copia de seguridad de sources.list -cp /etc/apt/sources.list /etc/apt/sources.list.old -# Comprobamos que el repositorio no está en soucers.list -output=`grep apt.openlighting.org /etc/apt/sources.list | wc -l` -if [ "$output" -eq "0" ]; then - #Añadimos el repositorio ola a sources.list - echo "deb http://apt.openlighting.org/debian/ squeeze main" >> /etc/apt/sources.list -fi -apt-get update -apt-get -y install ola -if [ "$?" -eq "0" ]; then - echo "apt-get finish ok" - else "apt-get return errors!" - fi - - - From 5b33ad8b216cfd766baa298f3d2e020caf40a90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20Nore=C3=B1a?= Date: Tue, 23 Apr 2013 19:25:37 +0200 Subject: [PATCH 2/3] - Bugfix make thumbs script not correctly invoked --- changelog.txt | 6 +++++- src/libremediaserver.cpp | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index b2b332d..04acda2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -23,7 +23,11 @@ Lbre Media Server ChangeLog ******************************************************************************* -V 0.04: +V 0.04-2 + ++ Bugfix make thumbs script not launched. + +V 0.04-1: + GUI: added FPS counter + GUI: added FPS selector diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index 826d738..672b6ed 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -510,7 +510,12 @@ void libreMediaServer::makeThumbs() QProcess *script = new QProcess (); QStringList arguments; arguments << m_pathmedia; - script->execute("../scripts/make_thumbs.sh", arguments); + qDebug() << "Creating thumbs in " << arguments; + QString s = "Creating thumbs in "; + s.append(arguments.at(0)); + s.append("This operation can take some time..."); + ui.textEdit->appendPlainText(s); + script->execute("./scripts/make_thumbs.sh", arguments); } /////////////////////////////////////////////////////////////////// From 4f85ff2f5a1e90b141510659045d8ff048264332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20Nore=C3=B1a?= Date: Tue, 23 Apr 2013 19:46:23 +0200 Subject: [PATCH 3/3] - v0.04-2 --- src/libremediaserver.cpp | 12 ++++++------ src/libremediaserver.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libremediaserver.cpp b/src/libremediaserver.cpp index 672b6ed..1e80473 100644 --- a/src/libremediaserver.cpp +++ b/src/libremediaserver.cpp @@ -507,14 +507,14 @@ void libreMediaServer::initMSEX() // Generates the thumbs to transmit by CITP/MSEx void libreMediaServer::makeThumbs() { - QProcess *script = new QProcess (); + QString s = "Creating thumbs in "; + s.append(m_pathmedia); + s.append(" This operation can take some time..."); + ui.textEdit->appendPlainText(s); + QProcess *script; QStringList arguments; arguments << m_pathmedia; - qDebug() << "Creating thumbs in " << arguments; - QString s = "Creating thumbs in "; - s.append(arguments.at(0)); - s.append("This operation can take some time..."); - ui.textEdit->appendPlainText(s); + qDebug() << s.toAscii(); script->execute("./scripts/make_thumbs.sh", arguments); } diff --git a/src/libremediaserver.h b/src/libremediaserver.h index 13540cd..54f27be 100644 --- a/src/libremediaserver.h +++ b/src/libremediaserver.h @@ -39,7 +39,7 @@ #include "MSEXDefines.h" #include "ui_libremediaserver.h" -#define VERSION "LibreMediaServer Version 0.04-1" +#define VERSION "LibreMediaServer Version 0.04-2" #define COPYRIGHT "(C) 2012-2013 Santi Norena libremediaserver@gmail.com" #define LICENSE "GPL 3 License. See LICENSE.txt and credits.txt for details"