Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-19 16:40:05 -04:00
parent 2afc4183bb a3b53ee3d3
commit f2e495cbd8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View File

@ -45,7 +45,7 @@ AIRTIME = (function(AIRTIME) {
function setWidgetSize() { function setWidgetSize() {
viewport = AIRTIME.utilities.findViewportDimensions(); viewport = AIRTIME.utilities.findViewportDimensions();
widgetHeight = viewport.height - 180; widgetHeight = viewport.height - 180;
screenWidth = Math.floor(viewport.width - 90); screenWidth = Math.floor(viewport.width - 40);
var libTableHeight = widgetHeight - 130, var libTableHeight = widgetHeight - 130,
builderTableHeight = widgetHeight - 95, builderTableHeight = widgetHeight - 95,

10
dev_tools/fabric/fab_liquidsoap_compile.py
View File

@ -176,11 +176,11 @@ def compile_liquidsoap(filename="liquidsoap"):
do_sudo('apt-get update') do_sudo('apt-get update')
do_sudo('apt-get upgrade -y --force-yes') do_sudo('apt-get upgrade -y --force-yes')
do_sudo('''apt-get install -y --force-yes ocaml-findlib libao-ocaml-dev libportaudio-ocaml-dev do_sudo('''apt-get install -y --force-yes ocaml-findlib libao-ocaml-dev libportaudio-ocaml-dev \
libmad-ocaml-dev libtaglib-ocaml-dev libalsa-ocaml-dev libtaglib-ocaml-dev libvorbis-ocaml-dev libmad-ocaml-dev libtaglib-ocaml-dev libalsa-ocaml-dev libtaglib-ocaml-dev libvorbis-ocaml-dev \
libspeex-dev libspeexdsp-dev speex libladspa-ocaml-dev festival festival-dev libspeex-dev libspeexdsp-dev speex libladspa-ocaml-dev festival festival-dev \
libsamplerate-dev libxmlplaylist-ocaml-dev libxmlrpc-light-ocaml-dev libflac-dev libsamplerate-dev libxmlplaylist-ocaml-dev libxmlrpc-light-ocaml-dev libflac-dev \
libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev \
libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl libfaad-dev''') libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl libfaad-dev''')
root = '/home/martin/src' root = '/home/martin/src'