[Demudi-commits] r1211 - in mixxx/trunk: . debian src
Free Ekanayaka
free-guest at alioth.debian.org
Thu Apr 19 06:35:12 UTC 2007
Author: free-guest
Date: 2007-04-19 06:34:57 +0000 (Thu, 19 Apr 2007)
New Revision: 1211
Added:
mixxx/trunk/debian/
mixxx/trunk/debian/changelog
mixxx/trunk/debian/compat
mixxx/trunk/debian/control
mixxx/trunk/debian/copyright
mixxx/trunk/debian/dirs
mixxx/trunk/debian/menu
mixxx/trunk/debian/mixxx-data.docs
mixxx/trunk/debian/mixxx-data.install
mixxx/trunk/debian/mixxx.desktop
mixxx/trunk/debian/mixxx.docs
mixxx/trunk/debian/mixxx.install
mixxx/trunk/debian/mixxx.links
mixxx/trunk/debian/mixxx.sgml
mixxx/trunk/debian/rules
mixxx/trunk/debian/watch
mixxx/trunk/src/mixxx-16.xpm
mixxx/trunk/src/mixxx.xpm
Modified:
mixxx/trunk/src/configure
mixxx/trunk/src/dlgprefsound.cpp
mixxx/trunk/src/main.qbas
mixxx/trunk/src/mixxx.pro
mixxx/trunk/src/mixxxview.cpp
mixxx/trunk/src/soundsourcemp3.cpp
mixxx/trunk/src/wvisualwaveform.cpp
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: mixxx/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: mixxx/trunk/debian/changelog
===================================================================
--- mixxx/trunk/debian/changelog 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/changelog 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,21 @@
+mixxx (1.4.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Replace unsatisfiable build-dependency on xlibmesa-glu-dev by
+ libglu1-mesa-dev; fixes FTBFS. (Closes: #374590)
+
+ -- Steinar H. Gunderson <sesse at debian.org> Wed, 28 Jun 2006 00:23:04 +0200
+
+mixxx (1.4.2-1) unstable; urgency=low
+
+ * Initial Release (closes: #227017).
+ * Modified src/mixxx.pro to be happier on debian
+ * Added #ifdef __vbrheadersdk__ to src/soundsourcemp3.c
+ * Removed non-free files in lib/gplot and lib/vbrheadersdk
+ * Converted png to xpm to add to menu icon, added .desktop
+ * Disable directRendering check to avoid crash when Visual=Simple
+ * Prevent latency slider to try setting the latency to 0
+ * Correct a typo on 'rendering' in mixxxview.cpp
+
+ -- Paul Brossier <piem at debian.org> Sat, 13 Aug 2005 00:14:24 +0100
+
Added: mixxx/trunk/debian/compat
===================================================================
--- mixxx/trunk/debian/compat 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/compat 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1 @@
+4
Added: mixxx/trunk/debian/control
===================================================================
--- mixxx/trunk/debian/control 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/control 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,34 @@
+Source: mixxx
+Section: sound
+Priority: optional
+Maintainer: Paul Brossier <piem at debian.org>
+Build-Depends: debhelper (>= 4.0.0), pkg-config, docbook-to-man, xlibmesa-gl-dev, libglu1-mesa-dev, libqt3-mt-dev, libqt3-compat-headers, libjack-dev, libsamplerate-dev, libportaudio-dev (<< 19.1-1), libid3tag0-dev, libmad0-dev, libogg-dev, libsndfile1-dev, libvorbis-dev, libexpat-dev, libglib1.2-dev
+Standards-Version: 3.6.2
+
+Package: mixxx
+Section: sound
+Architecture: any
+Depends: mixxx-data (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: pdf-viewer
+Description: Digital Disc Jockey Interface
+ Mixxx is a digital DJ system, where wave, ogg and mp3 files can be mixed on a
+ computer for use in live performances. Filters, crossfader, and speed control
+ are provided. Mixxx can sync the 2 streams automatically, using an algorithm
+ to detect the beat.
+ .
+ Mixxx works with Jack or OSS, can be controlled from the GUI or from external
+ controllers, including MIDI devices and joysticks, and supports skins.
+
+Package: mixxx-data
+Section: sound
+Architecture: all
+Description: Digital Disc Jockey Interface -- data files
+ This package provides images and skin configuration files required for mixxx.
+ .
+ Mixxx is a digital DJ system, where wave, ogg and mp3 files can be mixed on a
+ computer for use in live performances. Filters, crossfader, and speed control
+ are provided. Mixxx can sync the 2 streams automatically, using an algorithm
+ to detect the beat.
+ .
+ Mixxx works with Jack or OSS, can be controlled from the GUI or from external
+ controllers, including MIDI devices and joysticks, and supports skins.
Added: mixxx/trunk/debian/copyright
===================================================================
--- mixxx/trunk/debian/copyright 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/copyright 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,53 @@
+This package was debianized by Paul Brossier <piem at altern.org> on
+Fri, 26 Nov 2004 12:55:35 +0000.
+
+It was downloaded from http://mixxx.sourceforge.net/
+
+ Kissfft can be found at http://kissfft.sourceforge.net/
+
+ gplot and vbrheadersdk have been removed from the original archive as
+ they do not comply with the Debian Free Software Guidelines (DFSG).
+
+Copyright:
+ Mixxx
+ Copyright (C) 2000-2004 Haste Andersen and Mixxx developers
+ Kissfft
+ Copyright (c) 2003-2004 Mark Borgerding
+
+Upstream Authors: Tue Haste Andersen <haste at diku.dk>
+ and Ken Haste Andersen <kha at dfu.min.dk>
+
+License:
+
+Mixxx is released under the GNU General Public License Version 2 or above:
+
+ You are free to distribute this software under the terms of the GNU General
+ Public License. On Debian systems, the complete text of the GNU General Public
+ License can be found in the file `/usr/share/common-licenses/GPL'.
+
+Kissfft is distributed under a revised BSD license:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the author nor the names of any contributors may be used to
+ endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
Added: mixxx/trunk/debian/dirs
===================================================================
--- mixxx/trunk/debian/dirs 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/dirs 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1 @@
+usr/bin
Added: mixxx/trunk/debian/menu
===================================================================
--- mixxx/trunk/debian/menu 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/menu 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,7 @@
+?package(mixxx): \
+ needs="X11" \
+ section="Apps/Sound" \
+ title="Mixxx" \
+ command="/usr/bin/mixxx" \
+ icon="/usr/share/pixmaps/mixxx.xpm" \
+ icon16x16="/usr/share/pixmaps/mixxx-16.xpm"
Added: mixxx/trunk/debian/mixxx-data.docs
===================================================================
--- mixxx/trunk/debian/mixxx-data.docs 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx-data.docs 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1 @@
+Mixxx-Manual.pdf
Added: mixxx/trunk/debian/mixxx-data.install
===================================================================
--- mixxx/trunk/debian/mixxx-data.install 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx-data.install 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1 @@
+usr/share/mixxx
Added: mixxx/trunk/debian/mixxx.desktop
===================================================================
--- mixxx/trunk/debian/mixxx.desktop 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx.desktop 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mixxx
+Comment=a digital disc jockey interface
+Exec=mixxx
+Terminal=0
+Icon=/usr/share/pixmaps/mixxx.xpm
+Type=Application
+Categories=Application;AudioVideo;
Added: mixxx/trunk/debian/mixxx.docs
===================================================================
--- mixxx/trunk/debian/mixxx.docs 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx.docs 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,2 @@
+README
+README.ALSA
Added: mixxx/trunk/debian/mixxx.install
===================================================================
--- mixxx/trunk/debian/mixxx.install 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx.install 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/pixmaps
+usr/share/applications
Added: mixxx/trunk/debian/mixxx.links
===================================================================
--- mixxx/trunk/debian/mixxx.links 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx.links 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1 @@
+usr/share/doc/mixxx-data/Mixxx-Manual.pdf usr/share/doc/mixxx/Mixxx-Manual.pdf
Added: mixxx/trunk/debian/mixxx.sgml
===================================================================
--- mixxx/trunk/debian/mixxx.sgml 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/mixxx.sgml 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,132 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>Paul</firstname>">
+ <!ENTITY dhsurname "<surname>Brossier</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>November 26, 2004</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<email>piem at altern.org</email>">
+ <!ENTITY dhusername "Paul Brossier">
+ <!ENTITY dhucpackage "<refentrytitle>MIXXX</refentrytitle>">
+ <!ENTITY dhpackage "mixxx">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2003</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>a Digital Disc Jockey Interface</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the <command>&dhpackage;</command> command.</para>
+
+ <para><command>&dhpackage;</command> is a digital DJ system, where wave,
+ ogg and mp3 files can be mixed on a computer for use in live performances.
+ Filters, crossfader, and speed control are provided. &dhpackage; can sync
+ the 2 streams automatically, using an algorithm to detect the beat.</para>
+
+ <para>&dhpackage; works with Jack or OSS and can be controlled through the GUI
+ and with external controllers, including MIDI devices and joysticks. The
+ GUI supports skins.</para>
+
+ <para>This manual page was written for the &debian; distribution because
+ the original program does not have a manual page. Instead, it has
+ documentation in the pdf format; see below.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>This program takes no command line argument.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>SEE ALSO</title>
+
+ <para>/usr/share/doc/mixxx/Mixxx-Manual.pdf</para>
+
+ <para>The program is fully documented in the above pdf file.</para>
+
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; (&dhemail;) for the
+ &debian; system (but may be used by others). Permission is granted to
+ copy, distribute and/or modify this document under the terms of the &gnu;
+ General Public License, Version 2 any later version published by the Free
+ Software Foundation.</para>
+
+ <para> On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.</para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
Added: mixxx/trunk/debian/rules
===================================================================
--- mixxx/trunk/debian/rules 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/rules 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,108 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+ (cd src; QTDIR=/usr/share/qt3 ./configure --enable-jack)
+ # still experimental
+ # --enable-alsa
+ # hacky way to remove qmake generated -w!
+ sed -i 's/ -w / /' src/Makefile
+
+ touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+ dh_testdir
+
+ # Add here commands to compile the package.
+ (cd src; $(MAKE))
+ docbook-to-man debian/mixxx.sgml > mixxx.1
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -f mixxx.1
+
+ # Add here commands to clean up after the build process.
+ -(cd src; $(MAKE) clean)
+ # hand cleaning!
+ rm -rf src/.{configure.def,moc,obj,summary.log,ui} src/{mixxx,a.out,Makefile}
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/mixxx.
+ (cd src; $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp)
+
+ dh_install -ptmp debian/mixxx.desktop usr/share/applications
+ dh_install --sourcedir=$(CURDIR)/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+# dh_install
+ dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman mixxx.1
+ dh_link
+ dh_strip
+ dh_compress -Xpdf
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: mixxx/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: mixxx/trunk/debian/watch
===================================================================
--- mixxx/trunk/debian/watch 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/debian/watch 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,6 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site Directory Pattern Version Script
+version=2
+http://heanet.dl.sourceforge.net/sourceforge/mixxx/mixxx-(\d+\.+\d+\.+\d).tar.gz
Modified: mixxx/trunk/src/configure
===================================================================
--- mixxx/trunk/src/configure 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/configure 2007-04-19 06:34:57 UTC (rev 1211)
@@ -648,4 +648,3 @@
echo "-------------------------------------------"
$QT_QMAKE_EXEC $PROJECT_FILE
-
Modified: mixxx/trunk/src/dlgprefsound.cpp
===================================================================
--- mixxx/trunk/src/dlgprefsound.cpp 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/dlgprefsound.cpp 2007-04-19 06:34:57 UTC (rev 1211)
@@ -226,7 +226,7 @@
// Only correct latency slider if it's more than two milliseconds off the actual value.
// By changing the latency sliders value, the device is closed and opened again, and this
// function will thus be called again, resulting in a loop
- if (config->getValueString(ConfigKey("[Soundcard]","SoundApi"))!="None" &&
+ if (config->getValueString(ConfigKey("[Soundcard]","SoundApi"))!="None" && iLatencyMsec > 0 &&
abs(iLatencyMsec-config->getValueString(ConfigKey("[Soundcard]","Latency")).toInt())>2)
{
config->set(ConfigKey("[Soundcard]","Latency"), ConfigValue(iLatencyMsec));
Modified: mixxx/trunk/src/main.qbas
===================================================================
--- mixxx/trunk/src/main.qbas 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/main.qbas 2007-04-19 06:34:57 UTC (rev 1211)
@@ -55,6 +55,8 @@
LIBS -= -lqt
}
+# added for debian lib-qte-mt3
+INCLUDEPATH += /usr/include/qte3
# ************************************************* FOOTER
Added: mixxx/trunk/src/mixxx-16.xpm
===================================================================
--- mixxx/trunk/src/mixxx-16.xpm 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/mixxx-16.xpm 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,153 @@
+/* XPM */
+static const char *iconsmall[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 131 2",
+" c #D30000",
+". c #D30707",
+"X c #D30808",
+"o c #D30D0D",
+"O c #D30F0F",
+"+ c #D41A1A",
+"@ c #D42020",
+"# c #DF3D3D",
+"$ c #D44141",
+"% c #D54747",
+"& c #D64646",
+"* c #D64848",
+"= c #D64E4E",
+"- c #DB4B4B",
+"; c #D65555",
+": c #C17256",
+"> c #D66A6A",
+", c #D76A6A",
+"< c #E04949",
+"1 c #E15050",
+"2 c #E25857",
+"3 c #E45D5D",
+"4 c #E36464",
+"5 c #E66868",
+"6 c #E46D6D",
+"7 c #E77575",
+"8 c #E87979",
+"9 c #B6E5B8",
+"0 c #B6ECB7",
+"q c #BCE3BD",
+"w c #BEE2BF",
+"e c #BFE0C0",
+"r c #B6F6C0",
+"t c #D79090",
+"y c #DB9999",
+"u c #D89F9F",
+"i c #DCA8A8",
+"p c #DDAEAE",
+"a c #DAB4B4",
+"s c #E59999",
+"d c #EB9091",
+"f c #EB9696",
+"g c #EC9393",
+"h c #EF9396",
+"j c #EF9494",
+"k c #EE9A9A",
+"l c #EF9D9D",
+"z c #EE9F9F",
+"x c #EDB3B3",
+"c c #F2A3A6",
+"v c #F0AAAA",
+"b c #F1ADAD",
+"n c #F1AFAF",
+"m c #F3B6B6",
+"M c #F4BFBF",
+"N c #D6C5AD",
+"B c #CFDECF",
+"V c #CFDED0",
+"C c #DACDCD",
+"Z c #DBCECE",
+"A c #D0DED0",
+"S c #DBD2D2",
+"D c #DBD3D3",
+"F c gray85",
+"G c #D9DADA",
+"H c #DADADA",
+"J c #DADBDB",
+"K c gray86",
+"L c #D9DDDD",
+"P c #DADCDC",
+"I c #DBDCDC",
+"U c #DBDDDD",
+"Y c #DBDEDE",
+"T c #DBDFDF",
+"R c #DFDBDB",
+"E c #DCDBDC",
+"W c #DDDBDC",
+"Q c #DDDBDD",
+"! c #DEDBDE",
+"~ c gainsboro",
+"^ c gray87",
+"/ c #C2F0C3",
+"( c #CEF3D0",
+") c #DBE0E0",
+"_ c #DBE1E1",
+"` c #DBE2E2",
+"' c #DBE3E3",
+"] c #DBE4E4",
+"[ c #DBE5E5",
+"{ c #F4C2C2",
+"} c #F5C4C4",
+"| c #F6C4C4",
+" . c #F6CACA",
+".. c #F6CDCD",
+"X. c #FBCED1",
+"o. c #F7D1D1",
+"O. c #F6DCDC",
+"+. c #F9DDDD",
+"@. c #F9DFDF",
+"#. c #FADEDE",
+"$. c #E8EDDE",
+"%. c gray89",
+"&. c #E4E1E1",
+"*. c #E4E4E4",
+"=. c gray90",
+"-. c #E4E6E6",
+";. c #E5E6E6",
+":. c gray91",
+">. c #EAEAEA",
+",. c gray92",
+"<. c #EBECEC",
+"1. c #ECECEC",
+"2. c gray93",
+"3. c #EDF5F5",
+"4. c #FBE5E5",
+"5. c #F3F3F3",
+"6. c gray96",
+"7. c #F5FDF6",
+"8. c #FDF2F2",
+"9. c #FEF2F2",
+"0. c #FEF6F7",
+"q. c #F8F7F8",
+"w. c gray98",
+"e. c #FBFBFB",
+"r. c #FAFFFA",
+"t. c #FFFCFF",
+"y. c #FEFFFF",
+"u. c #FFFEFE",
+"i. c #FFFEFF",
+"p. c gray100",
+"a. c None",
+/* pixels */
+"a.a. a.a.a.a.a.a.a.a.a.a.a.a.",
+"a. a.T L K K K ! a.a.a.a.a.",
+" * [ L &.<.;.%.! B a.a.a.a.",
+" + u y - 8 p.p.p.6.9 w a.a.a.",
+"a.X $ s j # o.| 8.p./ / %.K a.a.",
+"a.C R O.1 ..b M p.( 0 r.q.J K a.",
+"a.L 3.| { k 7 X.N r 7.p.p.*.K a.",
+"a.K 5.p.#.8 0.c : $.p.p.p.,.F a.",
+"a.K 5.p.p.8.g 2 - h @.p.p.2.K a.",
+"a.K ,.p.p.p.p.v d p.l m p.*.K a.",
+"a.K K p.p.p.p.#.b .4 5 x ) ' a.",
+"a.a.K ;.p.p.p.p.4.l 3 6 p t = a.",
+"a.a.K K *.e.p.p.p.p.f i S @ a.",
+"a.a.a.K F K *.,.;.*.D > o ",
+"a.a.a.a.a.K K K ! J ) % ",
+"a.a.a.a.a.a.a.a.a.a.a.a.a. a."
+};
Modified: mixxx/trunk/src/mixxx.pro
===================================================================
--- mixxx/trunk/src/mixxx.pro 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/mixxx.pro 2007-04-19 06:34:57 UTC (rev 1211)
@@ -31,15 +31,17 @@
DEFINES += __PORTAUDIO__
SOURCES += playerportaudio.cpp
HEADERS += playerportaudio.h
-PORTAUDIO_DIR = ../lib/portaudio-v18
-INCLUDEPATH += $$PORTAUDIO_DIR/pa_common
-HEADERS += $$PORTAUDIO_DIR/pa_common/portaudio.h
+#PORTAUDIO_DIR = ../lib/portaudio-v18
+#INCLUDEPATH += $$PORTAUDIO_DIR/pa_common
+#HEADERS += $$PORTAUDIO_DIR/pa_common/portaudio.h
unix {
-SOURCES += $$PORTAUDIO_DIR/pa_common/pa_lib.c $$PORTAUDIO_DIR/pa_common/pa_convert.c
-HEADERS += $$PORTAUDIO_DIR/pa_common/pa_host.h
-unix:!macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix_oss.c
-unix:!macx:HEADERS += $$PORTAUDIO_DIR/pablio/ringbuffer.h $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.h
-unix:!macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_unix_oss
+#SOURCES += $$PORTAUDIO_DIR/pa_common/pa_lib.c $$PORTAUDIO_DIR/pa_common/pa_convert.c
+#HEADERS += $$PORTAUDIO_DIR/pa_common/pa_host.h
+#unix:!macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix_oss.c
+#unix:!macx:HEADERS += $$PORTAUDIO_DIR/pablio/ringbuffer.h $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.h
+#unix:!macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_unix_oss
+# on debian uses the portaudio package
+unix:LIBS += -lportaudio
macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_mac_core/pa_mac_core.c
macx:LIBS += -framework CoreAudio -framework AudioToolbox
macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio
@@ -115,9 +117,11 @@
macx:LIBS += $$MACLIBPATH/lib/libmad.a $$MACLIBPATH/lib/libid3tag.a
# MP3 vbrheadersdk from Xing Technology
-INCLUDEPATH += ../lib/vbrheadersdk
-SOURCES += ../lib/vbrheadersdk/dxhead.c
-HEADERS += ../lib/vbrheadersdk/dxhead.h
+# non free, no build on debian
+#DEFINES += __VBRHEADERSDK__
+#INCLUDEPATH += ../lib/vbrheadersdk
+#SOURCES += ../lib/vbrheadersdk/dxhead.c
+#HEADERS += ../lib/vbrheadersdk/dxhead.h
# Wave files
win32:SOURCES += soundsourcesndfile.cpp
@@ -162,10 +166,14 @@
HEADERS += $$KISSFFT_DIR/kiss_fft.h $$KISSFFT_DIR/kiss_fftr.h $$KISSFFT_DIR/_kiss_fft_guts.h
INCLUDEPATH += $$KISSFFT_DIR
-# Audio scaling
-INCLUDEPATH += ../lib/libsamplerate
-SOURCES += enginebufferscalesrc.cpp ../lib/libsamplerate/samplerate.c ../lib/libsamplerate/src_linear.c ../lib/libsamplerate/src_sinc.c ../lib/libsamplerate/src_zoh.c
-HEADERS += enginebufferscalesrc.h ../lib/libsamplerate/samplerate.h ../lib/libsamplerate/config.h ../lib/libsamplerate/common.h ../lib/libsamplerate/float_cast.h ../lib/libsamplerate/fastest_coeffs.h ../lib/libsamplerate/high_qual_coeffs.h ../lib/libsamplerate/mid_qual_coeffs.h
+# Audio scaling (use package on debian)
+#INCLUDEPATH += ../lib/libsamplerate
+SOURCES += enginebufferscalesrc.cpp
+#../lib/libsamplerate/samplerate.c ../lib/libsamplerate/src_linear.c ../lib/libsamplerate/src_sinc.c ../lib/libsamplerate/src_zoh.c
+HEADERS += enginebufferscalesrc.h
+# on debian
+unix:LIBS += -lsamplerate
+#../lib/libsamplerate/samplerate.h ../lib/libsamplerate/config.h ../lib/libsamplerate/common.h ../lib/libsamplerate/float_cast.h ../lib/libsamplerate/fastest_coeffs.h ../lib/libsamplerate/high_qual_coeffs.h ../lib/libsamplerate/mid_qual_coeffs.h
# Debug plotting through gplot API
#unix:DEFINES += __GNUPLOT__
@@ -174,6 +182,10 @@
#unix:HEADERS += ../lib/gplot/gplot.h
unix:!macx {
+ # set debian default flags
+ QMAKE_CXXFLAGS += -Wall -g -O2
+
+
# If Intel compiler is used, set icc optimization flags
COMPILER = $$system(echo $QMAKESPEC)
contains(COMPILER, linux-icc) {
@@ -260,22 +272,26 @@
keyb.files = keyboard/*
# doc files...
- readme.path = $${PREFIX}/share/doc/mixxx-1.3
+ readme.path = $${PREFIX}/share/doc/mixxx
readme.files = ../README
- licence.path = $${PREFIX}/share/doc/mixxx-1.3
- licence.files = ../LICENSE
- copying.path = $${PREFIX}/share/doc/mixxx-1.3
- copying.files = ../COPYING
- manual.path = $${PREFIX}/share/doc/mixxx-1.3
+ # redundant on debian
+ #licence.path = $${PREFIX}/share/doc/mixxx
+ #licence.files = ../LICENSE
+ #copying.path = $${PREFIX}/share/doc/mixxx
+ #copying.files = ../COPYING
+ manual.path = $${PREFIX}/share/doc/mixxx
manual.files = ../Mixxx-Manual.pdf
+ # menu icons
+ icon.path = $${PREFIX}/share/pixmaps
+ icon.files = mixxx.xpm mixxx-16.xpm
# binary...
TARGET = mixxx
target.path = $${PREFIX}/bin
# finally adding what we wanna install...
- INSTALLS += skino skinoc skinos skint midi keyb readme licence copying manual target
+ INSTALLS += skino skinoc skinos skint midi keyb readme licence copying manual target icon
}
Added: mixxx/trunk/src/mixxx.xpm
===================================================================
--- mixxx/trunk/src/mixxx.xpm 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/mixxx.xpm 2007-04-19 06:34:57 UTC (rev 1211)
@@ -0,0 +1,129 @@
+/* XPM */
+static char *iconlarge[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 91 1",
+" c #CD0100",
+". c #CA1208",
+"X c #D20000",
+"o c #D30B0B",
+"O c #D51212",
+"+ c #D71A1A",
+"@ c #D81C1C",
+"# c #D72121",
+"$ c #D42D2D",
+"% c #D92323",
+"& c #DA2B2B",
+"* c #D7312E",
+"= c #D43131",
+"- c #DC3333",
+"; c #DC3939",
+": c #D44747",
+"> c #D54B4B",
+", c #DD4444",
+"< c #D65555",
+"1 c #DD5858",
+"2 c #D56666",
+"3 c #D77C7C",
+"4 c #E04545",
+"5 c #E04B4B",
+"6 c #E05252",
+"7 c #E35B5B",
+"8 c #E36161",
+"9 c #E06E6E",
+"0 c #E67272",
+"q c #E87A7B",
+"w c #9EE6A0",
+"e c #9FE8A1",
+"r c #A3DE9E",
+"t c #A3E7A5",
+"y c #A3E8A6",
+"u c #A6E8A8",
+"i c #AFE6AD",
+"p c #A8E8AA",
+"a c #AFE6B1",
+"s c #B6ECB7",
+"d c #B8E3BA",
+"f c #BBEDBD",
+"g c #D98383",
+"h c #D88F8F",
+"j c #D99C9C",
+"k c #D9ACAC",
+"l c #D9B4B4",
+"z c #DABBBB",
+"x c #E08C8C",
+"c c #EA8485",
+"v c #EB8888",
+"b c #EC9393",
+"n c #EE9E9E",
+"m c #EFA3A3",
+"M c #F0A3A3",
+"N c #F0ABAB",
+"B c #F1B1B1",
+"V c #F3BCBC",
+"C c #CBE3BF",
+"Z c #CCDECC",
+"A c #DBC3C3",
+"S c #DBCECE",
+"D c #DAD2D2",
+"F c #DADADB",
+"G c #C7F0C9",
+"H c #DEE0DE",
+"J c #D1FAD7",
+"K c #DBF5DB",
+"L c #DBE3E3",
+"P c #DBE9E9",
+"I c #DBF4F4",
+"U c #F6CCCC",
+"Y c #F8D6D6",
+"T c #F8DBDB",
+"R c #E3E3E3",
+"E c #E1EEEE",
+"W c #E9E7E7",
+"Q c #EBEBEB",
+"! c #E1F7E1",
+"~ c #E2F8E2",
+"^ c #E6FCEA",
+"/ c #EEFBEE",
+"( c #E2F2F2",
+") c #FBE4E4",
+"_ c #FEE9EC",
+"` c #F4F4F4",
+"' c #F6FDF6",
+"] c #F6FAFA",
+"[ c #FDF4F4",
+"{ c #FEFEFE",
+"} c None",
+/* pixels */
+"}}}}}XX}}}}}}}}}}}}}}}}}}}}}}}}}",
+"}}}}XXXX}}}}}}}}}}}}}}}}}}}}}}}}",
+"}}}XXXXX}}}}}}}}}}}}}}}}}}}}}}}}",
+"}}XXXXXX}}}FFFFFFFFFF}}}}}}}}}}}",
+"}XXX}XX}}LFFFFFFFFFDFFF}}}}}}}}}",
+"XXX}XXOzLLPHW`[]]``RFFFZ}}}}}}}}",
+"XXX}XX3ILAg,,){{{{{{]QFauZ}}}}}}",
+"XX}XX<Lj:#5# m{{{{{{{]sedF}}}}}}",
+"}}}XX>=&qTqXq{[){{{{'ftfLFF}}}}}",
+"}}}O$:j[{0 0{{m-[{{]fws][FFF}}}}",
+"}}}SFL]{cXc{{BYU{{{Gwp/{{QFFF}}}",
+"}}}FFR{N 8{{BXm{{{Ktp!{{{`FFF}}}",
+"}}FFD`{;6{{VX7{T_^ut~{{{{{RFF}}}",
+"}}FFL{{)[{no7{{c*itK{{{{{{QFF}}}",
+"}}FFR{{{{NX>[{{c.rJ{{{{{{{]FFF}}",
+"}}FFQ{{{{Tb[{{{q.Z[[{{{{{{{FFF}}",
+"}}FFQ{{{{{{Y755#X*%-Y{{{{{{HFF}}",
+"}}FFR{{{{{{[v0b6ONVVTT[{{{]FFF}}",
+"}}FFH{{{{{{{{{{q#[{{{8b{{{`FF}}}",
+"}}FFF`{{{{{{{{{0@[{{{58{{{HFF}}}",
+"}}}FFH{{{{{{{{{m*[{{{;0{{[FFF}}}",
+"}}}FFF`{{{{{{{{{UVNmb@;q7hFLL}}}",
+"}}}}FFH{{{{{{{{{{N%-,@#712Sl}}}}",
+"}}}}FFFW{{{{{{{{{{[{{50{EPzoX}}}",
+"}}}}}FFFR{{{{{{{{{{{{;2(FP:XX}}}",
+"}}}}}}FFFHQ{{{{{{{{{];2IF}oXX}}}",
+"}}}}}}}FFFFHQ``]][QRHljh=XXXXXXX",
+"}}}}}}}}}FFFFFFFFFFFFPgXXXXXXXXX",
+"}}}}}}}}}}}FFFFFFFFFF}}XXXXXX}}X",
+"}}}}}}}}}}}}}}}}}}}}}}}}}}XXX}}}",
+"}}}}}}}}}}}}}}}}}}}}}}}}}}XXX}}}",
+"}}}}}}}}}}}}}}}}}}}}}}}}}}XXX}}}"
+};
Modified: mixxx/trunk/src/mixxxview.cpp
===================================================================
--- mixxx/trunk/src/mixxxview.cpp 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/mixxxview.cpp 2007-04-19 06:34:57 UTC (rev 1211)
@@ -391,7 +391,7 @@
if ((m_pVisualCh1 && !((WVisualWaveform *)m_pVisualCh1)->directRendering()) ||
(m_pVisualCh2 && !((WVisualWaveform *)m_pVisualCh2)->directRendering()))
QMessageBox::warning(0, "OpenGL Direct Rendering",
- "Direct redering is not enabled on your machine.\n\nThis means that the waveform displays will be very\nslow and take a lot of CPU time. Either update your\nconfiguration to enable direct rendering, or disable\nthe waveform displays in the control panel by\nselecting \"Simple\" under waveform displays.\nNOTE: In case you run on NVidia hardware, direct rendering may not be present, but you will not experience a degradation in performance.");
+ "Direct rendering is not enabled on your machine.\n\nThis means that the waveform displays will be very\nslow and take a lot of CPU time. Either update your\nconfiguration to enable direct rendering, or disable\nthe waveform displays in the control panel by\nselecting \"Simple\" under waveform displays.\nNOTE: In case you run on NVidia hardware, direct rendering may not be present, but you will not experience a degradation in performance.");
}
bool MixxxView::activeWaveform()
Modified: mixxx/trunk/src/soundsourcemp3.cpp
===================================================================
--- mixxx/trunk/src/soundsourcemp3.cpp 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/soundsourcemp3.cpp 2007-04-19 06:34:57 UTC (rev 1211)
@@ -16,9 +16,11 @@
#include "soundsourcemp3.h"
#include "trackinfoobject.h"
+#ifdef __VBRHEADERSDK__
extern "C" {
#include <dxhead.h>
}
+#endif
SoundSourceMp3::SoundSourceMp3(QString qFilename) : SoundSource(qFilename)
{
@@ -430,9 +432,10 @@
mad_stream_buffer(&Stream, (unsigned char *) inputbuf, READLENGTH);
// Check for Xing header
+ bool foundxing = false;
+#ifdef __VBRHEADERSDK__
XHEADDATA *xing = new XHEADDATA;
xing->toc = 0;
- bool foundxing = false;
if (GetXingHeader(xing, (unsigned char *)Stream.this_frame)==1)
{
foundxing = true;
@@ -444,6 +447,7 @@
}
}
delete xing;
+#endif
if (foundxing)
{
Modified: mixxx/trunk/src/wvisualwaveform.cpp
===================================================================
--- mixxx/trunk/src/wvisualwaveform.cpp 2007-04-19 06:34:25 UTC (rev 1210)
+++ mixxx/trunk/src/wvisualwaveform.cpp 2007-04-19 06:34:57 UTC (rev 1211)
@@ -57,7 +57,7 @@
bool WVisualWaveform::directRendering()
{
- return format().directRendering();
+ return 1; //format().directRendering();
}
void WVisualWaveform::dragEnterEvent(QDragEnterEvent *event)
More information about the Demudi-commits
mailing list