Attachment #45772 for bug #70491

View | Details | Raw Unified | Return to bug 70491
Collapse All | Expand All




#

PORTNAME=		hydrogen
PORTVERSION=		0.9.0b1
CATEGORIES=		audio
MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=		${PORTNAME}-0.9.0beta1

MAINTAINER=		jylefort@brutele.be
COMMENT=		An advanced drum machine

LIB_DEPENDS=		sndfile:${PORTSDIR}/audio/libsndfile \
			FLAC:${PORTSDIR}/audio/flac

USE_X_PREFIX=		yes
GNU_CONFIGURE=		yes

LDFLAGS=		-L${LOCALBASE}/lib -L${X11BASE}/lib
CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=		--program-prefix="" --disable-alsa-seq
ALL_TARGET=		clean all

MAN1=			hydrogen.1


		-e 's|-pthread|${PTHREAD_LIBS}|g' \
		${WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|' \
		${WRKSRC}/lib/fx/LadspaFX.cpp \
		${WRKSRC}/lib/PreferencesMng.cpp
	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
		${WRKSRC}/data/demo_songs/*.h2song

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)hydrogen/distinfo (-2 / +2 lines)
1	MD5 (hydrogen-0.8.2.tar.gz) = 65e16cabfaa414dabdd0039cad5eee94	1	MD5 (hydrogen-0.9.0beta1.tar.gz) = 85261cff0eca380bfcb2731fd490f4a8
2	SIZE (hydrogen-0.8.2.tar.gz) = 2066644	2	SIZE (hydrogen-0.9.0beta1.tar.gz) = 2499727




--- hydrogen_gui/InstrumentPropertiesDialog.cpp.orig	Sun Aug 15 19:06:50 2004
+++ hydrogen_gui/InstrumentPropertiesDialog.cpp	Sun Aug 15 19:07:17 2004
@@ -42,6 +42,12 @@
 #include "Mixer.h"
 #include "PatternEditorPanel.h"
 
+// workaround for gcc 2.96
+#if __GNUC__ < 3
+inline int round(double x) { return x > 0 ? (int) (x+0.5) :
+-(int)(-x+0.5); }
+#endif
+
 InstrumentPropertiesDialog::InstrumentPropertiesDialog( QWidget* parent )
  : InstrumentPropertiesDialog_UI(parent)
  , Object( "InstrPropDialog" )

Line 0 Link Here

(-)hydrogen/files/patch-hydrogen_gui::PatternEditor.cpp (+10 lines)
	1	--- hydrogen_gui/PatternEditor.cpp.orig Sun Aug 15 19:17:40 2004
	2	+++ hydrogen_gui/PatternEditor.cpp Sun Aug 15 19:30:40 2004
	3	@@ -36,6 +36,7 @@
	4	#include <assert.h>
	5	#include "qcursor.h"
	6
	7	+#include <algo.h>
	8
	9	PatternEditor::PatternEditor(QWidget* parent, PatternEditorPanel *pPanel)
	10	: QWidget(parent, "", WNoAutoErase )

Line 0 Link Here

(-)hydrogen/files/patch-hydrogen_gui::SongEditor.cpp (+11 lines)
	1	--- hydrogen_gui/SongEditor.cpp.orig Sun Aug 15 19:31:41 2004
	2	+++ hydrogen_gui/SongEditor.cpp Sun Aug 15 19:31:55 2004
	3	@@ -40,6 +40,8 @@
	4	#include "qvbox.h"
	5	#include "qcursor.h"
	6
	7	+#include <algo.h>
	8	+
	9	SongEditorPanel::SongEditorPanel(QWidget *parent)
	10	: QWidget(parent)
	11	, Object( "SongEditPanel" )




--- lib/Hydrogen.cpp.orig	Tue Mar  9 11:31:37 2004
+++ lib/Hydrogen.cpp	Thu Jun 24 17:05:13 2004
@@ -44,6 +44,263 @@
 #include "AlsaMidiDriver.h"
 
 
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ *
+ * Copyright (c) 2003, Steven G. Kargl
+ * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
+ * Copyright (c) 2002, 2003 David Schultz <dschultz@uclink.Berkeley.EDU>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice unmodified, this list of conditions, and the following
+ *    disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+#include <math.h>
+
+/* Symbolic constants to classify floating point numbers. */
+#define	COMPAT_FP_INFINITE	0x01
+#define	COMPAT_FP_NAN		0x02
+#define	COMPAT_FP_NORMAL	0x04
+#define	COMPAT_FP_SUBNORMAL	0x08
+#define	COMPAT_FP_ZERO		0x10
+
+#include <sys/endian.h>
+#define	compat_fpclassify(x) \
+    ((sizeof (x) == sizeof (float)) ? compat___fpclassifyf(x) \
+    : (sizeof (x) == sizeof (double)) ? compat___fpclassifyd(x) \
+    : compat___fpclassifyl(x))
+
+union compat_IEEEf2bits {
+	float	f;
+	struct {
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+		unsigned int	man	:23;
+		unsigned int	exp	:8;
+		unsigned int	sign	:1;
+#else /* _BIG_ENDIAN */
+		unsigned int	sign	:1;
+		unsigned int	exp	:8;
+		unsigned int	man	:23;
+#endif
+	} bits;
+};
+
+union compat_IEEEd2bits {
+	double	d;
+	struct {
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+		unsigned int	manl	:32;
+		unsigned int	manh	:20;
+		unsigned int	exp	:11;
+		unsigned int	sign	:1;
+#else /* _BIG_ENDIAN */
+		unsigned int	sign	:1;
+		unsigned int	exp	:11;
+		unsigned int	manh	:20;
+		unsigned int	manl	:32;
+#endif
+	} bits;
+};
+
+#ifdef __alpha__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int	manl	:32;
+		unsigned int	manh	:20;
+		unsigned int	exp	:11;
+		unsigned int	sign	:1;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((void)0)
+#elif __amd64__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int	manl	:32;
+		unsigned int	manh	:32;
+		unsigned int	exp	:15;
+		unsigned int	sign	:1;
+		unsigned int	junkl	:16;
+		unsigned int	junkh	:32;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((u).bits.manh &= 0x7fffffff)
+#elif __arm__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int	manl	:32;
+		unsigned int	manh	:32;
+		unsigned int	exp	:15;
+		unsigned int	sign	:1;
+		unsigned int	junk	:16;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((u).bits.manh &= 0x7fffffff)
+#elif __i386__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int	manl	:32;
+		unsigned int	manh	:32;
+		unsigned int	exp	:15;
+		unsigned int	sign	:1;
+		unsigned int	junk	:16;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((u).bits.manh &= 0x7fffffff)
+#elif __ia64__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+		unsigned int	manl	:32;
+		unsigned int	manh	:32;
+		unsigned int	exp	:15;
+		unsigned int	sign	:1;
+		unsigned long	junk	:48;
+#else /* _BIG_ENDIAN */
+		unsigned long	junk	:48;
+		unsigned int	sign	:1;
+		unsigned int	exp	:15;
+		unsigned int	manh	:32;
+		unsigned int	manl	:32;
+#endif
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((u).bits.manh &= 0x7fffffff)
+#elif __powerpc__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int		sign	:1;
+		unsigned int		exp	:15;
+		unsigned long long	manh	:48;
+		unsigned long long	manl	:64;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((void)0)
+#elif __sparc64__
+union compat_IEEEl2bits {
+	long double	e;
+	struct {
+		unsigned int	sign	:1;
+		unsigned int	exp	:15;
+		unsigned long	manh	:48;
+		unsigned long	manl	:64;
+	} bits;
+};
+#define	compat_mask_nbit_l(u)	((void)0)
+#endif
+
+static int
+compat___fpclassifyf(float f)
+{
+	union compat_IEEEf2bits u;
+
+	u.f = f;
+	if (u.bits.exp == 0) {
+		if (u.bits.man == 0)
+			return (COMPAT_FP_ZERO);
+		return (COMPAT_FP_SUBNORMAL);
+	}
+	if (u.bits.exp == 255) {
+		if (u.bits.man == 0)
+			return (COMPAT_FP_INFINITE);
+		return (COMPAT_FP_NAN);
+	}
+	return (COMPAT_FP_NORMAL);
+}
+
+static int
+compat___fpclassifyd(double d)
+{
+	union compat_IEEEd2bits u;
+
+	u.d = d;
+	if (u.bits.exp == 0) {
+		if ((u.bits.manl | u.bits.manh) == 0)
+			return (COMPAT_FP_ZERO);
+		return (COMPAT_FP_SUBNORMAL);
+	}
+	if (u.bits.exp == 2047) {
+		if ((u.bits.manl | u.bits.manh) == 0)
+			return (COMPAT_FP_INFINITE);
+		return (COMPAT_FP_NAN);
+	}
+	return (COMPAT_FP_NORMAL);
+}
+
+static int
+compat___fpclassifyl(long double e)
+{
+	union compat_IEEEl2bits u;
+
+	u.e = e;
+	if (u.bits.exp == 0) {
+		if ((u.bits.manl | u.bits.manh) == 0)
+			return (COMPAT_FP_ZERO);
+		return (COMPAT_FP_SUBNORMAL);
+	}
+	compat_mask_nbit_l(u);		/* Mask normalization bit if applicable. */
+	if (u.bits.exp == 32767) {
+		if ((u.bits.manl | u.bits.manh) == 0)
+			return (COMPAT_FP_INFINITE);
+		return (COMPAT_FP_NAN);
+	}
+	return (COMPAT_FP_NORMAL);
+}
+
+static double
+compat_round(double x)
+{
+	double t;
+	int i;
+
+	i = compat_fpclassify(x);
+	if (i == COMPAT_FP_INFINITE || i == COMPAT_FP_NAN)
+		return (x);
+
+	if (x >= 0.0) {
+		t = ceil(x);
+		if (t - x > 0.5)
+			t -= 1.0;
+		return (t);
+	} else {
+		t = ceil(-x);
+		if (t + x > 0.5)
+			t -= 1.0;
+		return (-t);
+	}
+}
+
+
 // GLOBALS
 
 pthread_mutex_t m_engineLock_mutex;	/// Mutex for syncronized access to the song object
@@ -1919,7 +2176,7 @@
 	uint res = pref->getPatternEditorGridResolution();
 	int nBase = pref->isPatternEditorUsingTriplets() ? 3 : 4;
 	int scalar = (4 * MAX_NOTES) / (res*nBase);
-	int qcolumn = (int)::round(column / (double)scalar) * scalar;
+	int qcolumn = (int)::compat_round(column / (double)scalar) * scalar;
 	if (qcolumn == MAX_NOTES) qcolumn = 0;
 
 	//printf ("column=%d  qcol=%d\n", column, qcolumn);

Line 0 Link Here

(-)hydrogen/files/patch-lib::PreferencesMng.cpp (+10 lines)
	1	--- lib/PreferencesMng.cpp.orig Sun Aug 15 18:53:34 2004
	2	+++ lib/PreferencesMng.cpp Sun Aug 15 18:53:45 2004
	3	@@ -70,7 +70,6 @@
	4	}
	5	else {
	6	m_ladspaPathVect.push_back("/usr/lib/ladspa");
	7	- m_ladspaPathVect.push_back("/usr/local/lib/ladspa");
	8	}
	9
	10	recordEvents = false;

Lines 1-11 Link Here

(-)hydrogen/files/patch-tools::Makefile.in (-7 / +7 lines)
1	--- tools/Makefile.in.orig Tue Jun 22 18:51:15 2004	1	--- tools/Makefile.in.orig Sun Aug 15 18:48:10 2004
2	+++ tools/Makefile.in Tue Jun 22 18:51:24 2004	2	+++ tools/Makefile.in Sun Aug 15 18:48:16 2004
3	@@ -243,7 +243,7 @@	3	@@ -240,7 +240,7 @@
4		4
5	hydrogenPlayer_SOURCES = hydrogenPlayer.cpp	5	hydrogenPlayer_SOURCES = hydrogenPlayer.cpp
6	hydrogenPlayer_LDADD = ../lib/libhydrogen.a	6	hydrogenPlayer_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a
7	-hydrogenPlayer_LDFLAGS = -ldl $(all_libraries)	7	-hydrogenPlayer_LDFLAGS = -ldl $(all_libraries)
8	+hydrogenPlayer_LDFLAGS = $(all_libraries)	8	+hydrogenPlayer_LDFLAGS = $(all_libraries)
9	subdir = tools	9
10	mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs	10	hydrogen2midi_SOURCES = hydrogen2midi.cpp
11	CONFIG_HEADER = $(top_builddir)/config.h	11	hydrogen2midi_LDADD = ../lib/libhydrogen.a ../lib/xml/libtinyxml.a ../lib/drivers/libdrivers.a ../lib/fx/libfx.a ../lib/smf/libsmf.a




bin/hydrogen
bin/hydrogen2midi
bin/hydrogenPlayer
share/hydrogen/data/DefaultSong.h2song
share/hydrogen/data/click.wav

share/hydrogen/data/demo_songs/GM_kit_demo1.h2song
share/hydrogen/data/demo_songs/GM_kit_demo2.h2song
share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
share/hydrogen/data/drumkits/GMkit/clap_Dry_c.flac
share/hydrogen/data/drumkits/GMkit/cra_Jazz.flac
share/hydrogen/data/drumkits/GMkit/cra_Rock_a.flac
share/hydrogen/data/drumkits/GMkit/cym_Jazz.flac
share/hydrogen/data/drumkits/GMkit/cym_Rock_b.flac
share/hydrogen/data/drumkits/GMkit/drumkit.xml
share/hydrogen/data/drumkits/GMkit/emptySample.flac
share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.flac
share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.flac
share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.flac
share/hydrogen/data/drumkits/GMkit/kick_Dry_b.flac
share/hydrogen/data/drumkits/GMkit/misc_Cowbell.flac
share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.flac
share/hydrogen/data/drumkits/GMkit/sn_Wet_b.flac
share/hydrogen/data/drumkits/GMkit/stick_Woody.flac
share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.flac
share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.flac
share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.flac
share/hydrogen/data/emptySample.wav
share/hydrogen/i18n/hydrogen.es.qm
share/hydrogen/i18n/hydrogen.fr.qm

share/hydrogen/manual/img/showFX_on.png
share/hydrogen/manual/img/showPeaks_on.png
share/hydrogen/manual/img/tastiera.png
share/hydrogen/manual/img_tutorial/Bridge1_4th.png
share/hydrogen/manual/img_tutorial/Bridge3_3a_hh.png
share/hydrogen/manual/img_tutorial/C3_6+7.png
share/hydrogen/manual/img_tutorial/Intro4th.png
share/hydrogen/manual/img_tutorial/PatternBase1.png
share/hydrogen/manual/img_tutorial/PatternBase2.png
share/hydrogen/manual/img_tutorial/Riff1b.png
share/hydrogen/manual/img_tutorial/Riff1c.png
share/hydrogen/manual/img_tutorial/Riff1d.png
share/hydrogen/manual/img_tutorial/Verse8th.png
share/hydrogen/manual/img_tutorial/VerseAll.png
share/hydrogen/manual/img_tutorial/VerseBridge.png
share/hydrogen/manual/img_tutorial/VerseBridge_hh.png
share/hydrogen/manual/manual.html
share/hydrogen/manual/manual_de.html
share/hydrogen/manual/manual_en.html
share/hydrogen/manual/manual_es.html
share/hydrogen/manual/manual_fr.html
share/hydrogen/manual/manual_it.html
share/hydrogen/manual/tutorial_en.html
share/hydrogen/manual/tutorial_it.html
@dirrm share/hydrogen/data/demo_songs
@dirrm share/hydrogen/data/drumkits/GMkit
@dirrm share/hydrogen/data/drumkits

@dirrm share/hydrogen/img/splash
@dirrm share/hydrogen/img
@dirrm share/hydrogen/manual/img
@dirrm share/hydrogen/manual/img_tutorial
@dirrm share/hydrogen/manual
@dirrm share/hydrogen

Return to bug 70491

Lines 6-20 Link Here

(-)hydrogen/Makefile (-6 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= hydrogen	8	PORTNAME= hydrogen
9	PORTVERSION= 0.8.2	9	PORTVERSION= 0.9.0b1
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
		13	DISTNAME= ${PORTNAME}-0.9.0beta1
13		14
14	MAINTAINER= jylefort@brutele.be	15	MAINTAINER= jylefort@brutele.be
15	COMMENT= An advanced drum machine	16	COMMENT= An advanced drum machine
16		17
17	LIB_DEPENDS= audiofile:${PORTSDIR}/audio/libaudiofile	18	LIB_DEPENDS= sndfile:${PORTSDIR}/audio/libsndfile \
		19	FLAC:${PORTSDIR}/audio/flac
18		20
19	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
20	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
Lines 26-32 Link Here
26	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib	28	LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28	CONFIGURE_ARGS= --program-prefix="" --disable-alsa-seq	30	CONFIGURE_ARGS= --program-prefix="" --disable-alsa-seq
29	ALL_TARGET= clean all
30		31
31	MAN1= hydrogen.1	32	MAN1= hydrogen.1
32		33
Lines 59-67 Link Here
59	-e 's\|-pthread\|${PTHREAD_LIBS}\|g' \	60	-e 's\|-pthread\|${PTHREAD_LIBS}\|g' \
60	${WRKSRC}/${CONFIGURE_SCRIPT}	61	${WRKSRC}/${CONFIGURE_SCRIPT}
61	@${REINPLACE_CMD} -e 's\|/usr\|${LOCALBASE}\|' \	62	@${REINPLACE_CMD} -e 's\|/usr\|${LOCALBASE}\|' \
62	${WRKSRC}/lib/LadspaFX.cpp \	63	${WRKSRC}/lib/fx/LadspaFX.cpp \
63	${WRKSRC}/lib/PreferencesMng.cpp	64	${WRKSRC}/lib/PreferencesMng.cpp
64	@${REINPLACE_CMD} -e 's\|/usr/local\|${PREFIX}\|g' \
65	${WRKSRC}/data/demo_songs/*.h2song
66		65
67	.include <bsd.port.post.mk>	66	.include <bsd.port.post.mk>

Line 0 Link Here

(-)hydrogen/files/patch-hydrogen_gui::InstrumentPropertiesDialog.cpp (+15 lines)
	1	--- hydrogen_gui/InstrumentPropertiesDialog.cpp.orig Sun Aug 15 19:06:50 2004
	2	+++ hydrogen_gui/InstrumentPropertiesDialog.cpp Sun Aug 15 19:07:17 2004
	3	@@ -42,6 +42,12 @@
	4	#include "Mixer.h"
	5	#include "PatternEditorPanel.h"
	6
	7	+// workaround for gcc 2.96
	8	+#if __GNUC__ < 3
	9	+inline int round(double x) { return x > 0 ? (int) (x+0.5) :
	10	+-(int)(-x+0.5); }
	11	+#endif
	12	+
	13	InstrumentPropertiesDialog::InstrumentPropertiesDialog( QWidget* parent )
	14	: InstrumentPropertiesDialog_UI(parent)
	15	, Object( "InstrPropDialog" )

Lines 1-275 Link Here

(-)hydrogen/files/patch-lib::Hydrogen.cpp (-275 lines)
1	--- lib/Hydrogen.cpp.orig Tue Mar 9 11:31:37 2004
2	+++ lib/Hydrogen.cpp Thu Jun 24 17:05:13 2004
3	@@ -44,6 +44,263 @@
4	#include "AlsaMidiDriver.h"
5
6
7	+/*
8	+ * ====================================================
9	+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
10	+ *
11	+ * Developed at SunPro, a Sun Microsystems, Inc. business.
12	+ * Permission to use, copy, modify, and distribute this
13	+ * software is freely granted, provided that this notice
14	+ * is preserved.
15	+ * ====================================================
16	+ *
17	+ * Copyright (c) 2003, Steven G. Kargl
18	+ * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
19	+ * Copyright (c) 2002, 2003 David Schultz <dschultz@uclink.Berkeley.EDU>
20	+ * All rights reserved.
21	+ *
22	+ * Redistribution and use in source and binary forms, with or without
23	+ * modification, are permitted provided that the following conditions
24	+ * are met:
25	+ * 1. Redistributions of source code must retain the above copyright
26	+ * notice unmodified, this list of conditions, and the following
27	+ * disclaimer.
28	+ * 2. Redistributions in binary form must reproduce the above copyright
29	+ * notice, this list of conditions and the following disclaimer in the
30	+ * documentation and/or other materials provided with the distribution.
31	+ *
32	+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
33	+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
34	+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
35	+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
36	+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
37	+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
38	+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
39	+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
40	+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
41	+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42	+ */
43	+#include <math.h>
44	+
45	+/* Symbolic constants to classify floating point numbers. */
46	+#define COMPAT_FP_INFINITE 0x01
47	+#define COMPAT_FP_NAN 0x02
48	+#define COMPAT_FP_NORMAL 0x04
49	+#define COMPAT_FP_SUBNORMAL 0x08
50	+#define COMPAT_FP_ZERO 0x10
51	+
52	+#include <sys/endian.h>
53	+#define compat_fpclassify(x) \
54	+ ((sizeof (x) == sizeof (float)) ? compat___fpclassifyf(x) \
55	+ : (sizeof (x) == sizeof (double)) ? compat___fpclassifyd(x) \
56	+ : compat___fpclassifyl(x))
57	+
58	+union compat_IEEEf2bits {
59	+ float f;
60	+ struct {
61	+#if _BYTE_ORDER == _LITTLE_ENDIAN
62	+ unsigned int man :23;
63	+ unsigned int exp :8;
64	+ unsigned int sign :1;
65	+#else /* _BIG_ENDIAN */
66	+ unsigned int sign :1;
67	+ unsigned int exp :8;
68	+ unsigned int man :23;
69	+#endif
70	+ } bits;
71	+};
72	+
73	+union compat_IEEEd2bits {
74	+ double d;
75	+ struct {
76	+#if _BYTE_ORDER == _LITTLE_ENDIAN
77	+ unsigned int manl :32;
78	+ unsigned int manh :20;
79	+ unsigned int exp :11;
80	+ unsigned int sign :1;
81	+#else /* _BIG_ENDIAN */
82	+ unsigned int sign :1;
83	+ unsigned int exp :11;
84	+ unsigned int manh :20;
85	+ unsigned int manl :32;
86	+#endif
87	+ } bits;
88	+};
89	+
90	+#ifdef __alpha__
91	+union compat_IEEEl2bits {
92	+ long double e;
93	+ struct {
94	+ unsigned int manl :32;
95	+ unsigned int manh :20;
96	+ unsigned int exp :11;
97	+ unsigned int sign :1;
98	+ } bits;
99	+};
100	+#define compat_mask_nbit_l(u) ((void)0)
101	+#elif __amd64__
102	+union compat_IEEEl2bits {
103	+ long double e;
104	+ struct {
105	+ unsigned int manl :32;
106	+ unsigned int manh :32;
107	+ unsigned int exp :15;
108	+ unsigned int sign :1;
109	+ unsigned int junkl :16;
110	+ unsigned int junkh :32;
111	+ } bits;
112	+};
113	+#define compat_mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff)
114	+#elif __arm__
115	+union compat_IEEEl2bits {
116	+ long double e;
117	+ struct {
118	+ unsigned int manl :32;
119	+ unsigned int manh :32;
120	+ unsigned int exp :15;
121	+ unsigned int sign :1;
122	+ unsigned int junk :16;
123	+ } bits;
124	+};
125	+#define compat_mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff)
126	+#elif __i386__
127	+union compat_IEEEl2bits {
128	+ long double e;
129	+ struct {
130	+ unsigned int manl :32;
131	+ unsigned int manh :32;
132	+ unsigned int exp :15;
133	+ unsigned int sign :1;
134	+ unsigned int junk :16;
135	+ } bits;
136	+};
137	+#define compat_mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff)
138	+#elif __ia64__
139	+union compat_IEEEl2bits {
140	+ long double e;
141	+ struct {
142	+#if _BYTE_ORDER == _LITTLE_ENDIAN
143	+ unsigned int manl :32;
144	+ unsigned int manh :32;
145	+ unsigned int exp :15;
146	+ unsigned int sign :1;
147	+ unsigned long junk :48;
148	+#else /* _BIG_ENDIAN */
149	+ unsigned long junk :48;
150	+ unsigned int sign :1;
151	+ unsigned int exp :15;
152	+ unsigned int manh :32;
153	+ unsigned int manl :32;
154	+#endif
155	+ } bits;
156	+};
157	+#define compat_mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff)
158	+#elif __powerpc__
159	+union compat_IEEEl2bits {
160	+ long double e;
161	+ struct {
162	+ unsigned int sign :1;
163	+ unsigned int exp :15;
164	+ unsigned long long manh :48;
165	+ unsigned long long manl :64;
166	+ } bits;
167	+};
168	+#define compat_mask_nbit_l(u) ((void)0)
169	+#elif __sparc64__
170	+union compat_IEEEl2bits {
171	+ long double e;
172	+ struct {
173	+ unsigned int sign :1;
174	+ unsigned int exp :15;
175	+ unsigned long manh :48;
176	+ unsigned long manl :64;
177	+ } bits;
178	+};
179	+#define compat_mask_nbit_l(u) ((void)0)
180	+#endif
181	+
182	+static int
183	+compat___fpclassifyf(float f)
184	+{
185	+ union compat_IEEEf2bits u;
186	+
187	+ u.f = f;
188	+ if (u.bits.exp == 0) {
189	+ if (u.bits.man == 0)
190	+ return (COMPAT_FP_ZERO);
191	+ return (COMPAT_FP_SUBNORMAL);
192	+ }
193	+ if (u.bits.exp == 255) {
194	+ if (u.bits.man == 0)
195	+ return (COMPAT_FP_INFINITE);
196	+ return (COMPAT_FP_NAN);
197	+ }
198	+ return (COMPAT_FP_NORMAL);
199	+}
200	+
201	+static int
202	+compat___fpclassifyd(double d)
203	+{
204	+ union compat_IEEEd2bits u;
205	+
206	+ u.d = d;
207	+ if (u.bits.exp == 0) {
208	+ if ((u.bits.manl \| u.bits.manh) == 0)
209	+ return (COMPAT_FP_ZERO);
210	+ return (COMPAT_FP_SUBNORMAL);
211	+ }
212	+ if (u.bits.exp == 2047) {
213	+ if ((u.bits.manl \| u.bits.manh) == 0)
214	+ return (COMPAT_FP_INFINITE);
215	+ return (COMPAT_FP_NAN);
216	+ }
217	+ return (COMPAT_FP_NORMAL);
218	+}
219	+
220	+static int
221	+compat___fpclassifyl(long double e)
222	+{
223	+ union compat_IEEEl2bits u;
224	+
225	+ u.e = e;
226	+ if (u.bits.exp == 0) {
227	+ if ((u.bits.manl \| u.bits.manh) == 0)
228	+ return (COMPAT_FP_ZERO);
229	+ return (COMPAT_FP_SUBNORMAL);
230	+ }
231	+ compat_mask_nbit_l(u); /* Mask normalization bit if applicable. */
232	+ if (u.bits.exp == 32767) {
233	+ if ((u.bits.manl \| u.bits.manh) == 0)
234	+ return (COMPAT_FP_INFINITE);
235	+ return (COMPAT_FP_NAN);
236	+ }
237	+ return (COMPAT_FP_NORMAL);
238	+}
239	+
240	+static double
241	+compat_round(double x)
242	+{
243	+ double t;
244	+ int i;
245	+
246	+ i = compat_fpclassify(x);
247	+ if (i == COMPAT_FP_INFINITE \|\| i == COMPAT_FP_NAN)
248	+ return (x);
249	+
250	+ if (x >= 0.0) {
251	+ t = ceil(x);
252	+ if (t - x > 0.5)
253	+ t -= 1.0;
254	+ return (t);
255	+ } else {
256	+ t = ceil(-x);
257	+ if (t + x > 0.5)
258	+ t -= 1.0;
259	+ return (-t);
260	+ }
261	+}
262	+
263	+
264	// GLOBALS
265
266	pthread_mutex_t m_engineLock_mutex; /// Mutex for syncronized access to the song object
267	@@ -1919,7 +2176,7 @@
268	uint res = pref->getPatternEditorGridResolution();
269	int nBase = pref->isPatternEditorUsingTriplets() ? 3 : 4;
270	int scalar = (4 * MAX_NOTES) / (res*nBase);
271	- int qcolumn = (int)::round(column / (double)scalar) * scalar;
272	+ int qcolumn = (int)::compat_round(column / (double)scalar) * scalar;
273	if (qcolumn == MAX_NOTES) qcolumn = 0;
274
275	//printf ("column=%d qcol=%d\n", column, qcolumn);

Lines 1-4 Link Here

(-)hydrogen/pkg-plist (-17 / +36 lines)
1	bin/hydrogen	1	bin/hydrogen
		2	bin/hydrogen2midi
2	bin/hydrogenPlayer	3	bin/hydrogenPlayer
3	share/hydrogen/data/DefaultSong.h2song	4	share/hydrogen/data/DefaultSong.h2song
4	share/hydrogen/data/click.wav	5	share/hydrogen/data/click.wav
Lines 7-30 Link Here
7	share/hydrogen/data/demo_songs/GM_kit_demo1.h2song	8	share/hydrogen/data/demo_songs/GM_kit_demo1.h2song
8	share/hydrogen/data/demo_songs/GM_kit_demo2.h2song	9	share/hydrogen/data/demo_songs/GM_kit_demo2.h2song
9	share/hydrogen/data/demo_songs/GM_kit_demo3.h2song	10	share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
10	share/hydrogen/data/drumkits/GMkit/clap_Dry_c.wav	11	share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
11	share/hydrogen/data/drumkits/GMkit/cra_Jazz.wav	12	share/hydrogen/data/drumkits/GMkit/clap_Dry_c.flac
12	share/hydrogen/data/drumkits/GMkit/cra_Rock_a.wav	13	share/hydrogen/data/drumkits/GMkit/cra_Jazz.flac
13	share/hydrogen/data/drumkits/GMkit/cym_Jazz.wav	14	share/hydrogen/data/drumkits/GMkit/cra_Rock_a.flac
14	share/hydrogen/data/drumkits/GMkit/cym_Rock_b.wav	15	share/hydrogen/data/drumkits/GMkit/cym_Jazz.flac
		16	share/hydrogen/data/drumkits/GMkit/cym_Rock_b.flac
15	share/hydrogen/data/drumkits/GMkit/drumkit.xml	17	share/hydrogen/data/drumkits/GMkit/drumkit.xml
16	share/hydrogen/data/drumkits/GMkit/emptySample.wav	18	share/hydrogen/data/drumkits/GMkit/emptySample.flac
17	share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.wav	19	share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.flac
18	share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.wav	20	share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.flac
19	share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.wav	21	share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.flac
20	share/hydrogen/data/drumkits/GMkit/kick_Dry_b.wav	22	share/hydrogen/data/drumkits/GMkit/kick_Dry_b.flac
21	share/hydrogen/data/drumkits/GMkit/misc_Cowbell.wav	23	share/hydrogen/data/drumkits/GMkit/misc_Cowbell.flac
22	share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.wav	24	share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.flac
23	share/hydrogen/data/drumkits/GMkit/sn_Wet_b.wav	25	share/hydrogen/data/drumkits/GMkit/sn_Wet_b.flac
24	share/hydrogen/data/drumkits/GMkit/stick_Woody.wav	26	share/hydrogen/data/drumkits/GMkit/stick_Woody.flac
25	share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.wav	27	share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.flac
26	share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.wav	28	share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.flac
27	share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.wav	29	share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.flac
28	share/hydrogen/data/emptySample.wav	30	share/hydrogen/data/emptySample.wav
29	share/hydrogen/i18n/hydrogen.es.qm	31	share/hydrogen/i18n/hydrogen.es.qm
30	share/hydrogen/i18n/hydrogen.fr.qm	32	share/hydrogen/i18n/hydrogen.fr.qm
Lines 170-180 Link Here
170	share/hydrogen/manual/img/showFX_on.png	172	share/hydrogen/manual/img/showFX_on.png
171	share/hydrogen/manual/img/showPeaks_on.png	173	share/hydrogen/manual/img/showPeaks_on.png
172	share/hydrogen/manual/img/tastiera.png	174	share/hydrogen/manual/img/tastiera.png
		175	share/hydrogen/manual/img_tutorial/Bridge1_4th.png
		176	share/hydrogen/manual/img_tutorial/Bridge3_3a_hh.png
		177	share/hydrogen/manual/img_tutorial/C3_6+7.png
		178	share/hydrogen/manual/img_tutorial/Intro4th.png
		179	share/hydrogen/manual/img_tutorial/PatternBase1.png
		180	share/hydrogen/manual/img_tutorial/PatternBase2.png
		181	share/hydrogen/manual/img_tutorial/Riff1b.png
		182	share/hydrogen/manual/img_tutorial/Riff1c.png
		183	share/hydrogen/manual/img_tutorial/Riff1d.png
		184	share/hydrogen/manual/img_tutorial/Verse8th.png
		185	share/hydrogen/manual/img_tutorial/VerseAll.png
		186	share/hydrogen/manual/img_tutorial/VerseBridge.png
		187	share/hydrogen/manual/img_tutorial/VerseBridge_hh.png
173	share/hydrogen/manual/manual.html	188	share/hydrogen/manual/manual.html
174	share/hydrogen/manual/manual_de.html	189	share/hydrogen/manual/manual_de.html
175	share/hydrogen/manual/manual_en.html	190	share/hydrogen/manual/manual_en.html
176	share/hydrogen/manual/manual_es.html	191	share/hydrogen/manual/manual_es.html
		192	share/hydrogen/manual/manual_fr.html
177	share/hydrogen/manual/manual_it.html	193	share/hydrogen/manual/manual_it.html
		194	share/hydrogen/manual/tutorial_en.html
		195	share/hydrogen/manual/tutorial_it.html
178	@dirrm share/hydrogen/data/demo_songs	196	@dirrm share/hydrogen/data/demo_songs
179	@dirrm share/hydrogen/data/drumkits/GMkit	197	@dirrm share/hydrogen/data/drumkits/GMkit
180	@dirrm share/hydrogen/data/drumkits	198	@dirrm share/hydrogen/data/drumkits
Lines 188-192 Link Here
188	@dirrm share/hydrogen/img/splash	206	@dirrm share/hydrogen/img/splash
189	@dirrm share/hydrogen/img	207	@dirrm share/hydrogen/img
190	@dirrm share/hydrogen/manual/img	208	@dirrm share/hydrogen/manual/img
		209	@dirrm share/hydrogen/manual/img_tutorial
191	@dirrm share/hydrogen/manual	210	@dirrm share/hydrogen/manual
192	@dirrm share/hydrogen	211	@dirrm share/hydrogen