Merge branch 'v0.04'

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

scripts/install_squeeze.sh

@@ -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
-
-
-

src/libremediaserver.cpp

@@ -507,10 +507,15 @@ 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;
-    script->execute("../scripts/make_thumbs.sh", arguments);
+    qDebug() << s.toAscii();
+    script->execute("./scripts/make_thumbs.sh", arguments);
 }
 
 ///////////////////////////////////////////////////////////////////

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"