[Sv1-commits] SF.net SVN: sv1:[1691] sonic-visualiser/trunk

[<ca...@us...>]

Revision: 1691
          http://sv1.svn.sourceforge.net/sv1/?rev=1691&view=rev
Author:   cannam
Date:     2010-05-05 14:46:26 +0000 (Wed, 05 May 2010)

Log Message:
-----------

* Add Ubuntu-specific note

Modified Paths:
--------------
    sonic-visualiser/trunk/INSTALL
    sonic-visualiser/trunk/sv/main/Surveyer.cpp

Added Paths:
-----------
    sonic-visualiser/trunk/INSTALL.ubuntu

Modified: sonic-visualiser/trunk/INSTALL
===================================================================
--- sonic-visualiser/trunk/INSTALL	2010-05-05 14:45:32 UTC (rev 1690)
+++ sonic-visualiser/trunk/INSTALL	2010-05-05 14:46:26 UTC (rev 1691)
@@ -5,6 +5,11 @@
 First, please consider getting one of the ready-to-run binary
 distributions available from http://www.sonicvisualiser.org/ .
 
+This file provides various instructions useful when compiling Sonic
+Visualiser from source, but it doesn't have a complete recipe for any
+one platform -- there are too many variables.  However, you can find a
+recipe for one platform (Ubuntu Linux) in the file INSTALL.ubuntu.
+
 The following additional libraries are required or optional when
 building Sonic Visualiser:
 
@@ -42,7 +47,8 @@
 If you happen to be using a Debian-based Linux, you probably want to
 apt-get install the following packages: libqt4-dev libsndfile1-dev
 libsamplerate0-dev fftw3-dev libbz2-dev libjack-dev libmad0-dev
-liboggz1-dev libfishsound1-dev liblo0-dev liblrdf0-dev librdf0-dev .
+liboggz1-dev libfishsound1-dev libasound2-dev liblo0-dev liblrdf0-dev
+librdf0-dev .
 
 If you are building on a Unix-like system that supports pkg-config and
 uses it for all appropriate libraries (such as a modern Linux

Added: sonic-visualiser/trunk/INSTALL.ubuntu
===================================================================
--- sonic-visualiser/trunk/INSTALL.ubuntu	                        (rev 0)
+++ sonic-visualiser/trunk/INSTALL.ubuntu	2010-05-05 14:46:26 UTC (rev 1691)
@@ -0,0 +1,23 @@
+
+To compile Sonic Visualiser from source in Ubuntu 10.04
+-------------------------------------------------------
+
+See INSTALL for general notes on compilation.  This is a specific
+recipe for Ubuntu 10.04.
+
+Starting from a clean installation of Ubuntu 10.04 desktop edition,
+with a working network connection, with the Sonic Visualiser source
+code unpacked into $HOME/sonic-visualiser:
+
+$ cd sonic-visualiser
+$ sudo apt-get update
+$ sudo apt-get install build-essential libqt4-dev libsndfile-dev libsamplerate-dev fftw3-dev libbz2-dev libjack-dev libasound-dev libmad0-dev liboggz-dev libfishsound-dev liblo-dev liblrdf-dev librdf-dev librubberband-dev vamp-plugin-sdk
+$ qmake-qt4
+$ make
+
+And wait for some time for the build to complete.
+
+You should now have an executable file at sv/sonic-visualiser.  You
+don't need to properly install this -- just run it in place, or copy
+it to wherever you like.
+

Modified: sonic-visualiser/trunk/sv/main/Surveyer.cpp
===================================================================
--- sonic-visualiser/trunk/sv/main/Surveyer.cpp	2010-05-05 14:45:32 UTC (rev 1690)
+++ sonic-visualiser/trunk/sv/main/Surveyer.cpp	2010-05-05 14:46:26 UTC (rev 1691)
@@ -42,7 +42,7 @@
     QSettings settings;
     settings.beginGroup("Survey");
     if (!settings.contains("countdown")) {
-        settings.setValue("countdown", 5);
+        settings.setValue("countdown", 15);
         settings.endGroup();
         return;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.