Attachment #25578 for bug #43691

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




#

PORTNAME=	Maaate
PORTVERSION=	0.3.0
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	http://www.cmis.csiro.au/maaate/packages/


INSTALLS_SHLIB=	yes

post-patch:
	@${REINPLACE_CMD} -e 's|-ldl||g ; \
		 s|(CCLD|(CXXLD|g' ${WRKSRC}/demos/Makefile.in

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in API.html ChangeLog THANKS applications.html
	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/Maaate/distinfo (-1 / +1 lines)
1	MD5 (Maaate-0.2.2.tar.gz) = a758510d0cd76d5924506ca976508979	1	MD5 (Maaate-0.3.0.tar.gz) = 7256ac6c8cdcb93e398d359478f0572c

Line 0 Link Here

(-)audio/Maaate/files/patch-configure (+10 lines)
	1	--- configure.orig Thu Sep 5 09:54:07 2002
	2	+++ configure Mon Sep 30 22:55:21 2002
	3	@@ -5691,6 +5691,7 @@
	4
	5	# This can be used to rebuild libtool when needed
	6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	8
	9	# Always use our own libtool.
	10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'




--- src/mpeg/MPEGfile.cc.orig	Mon Mar  4 03:31:28 2002
+++ src/mpeg/MPEGfile.cc	Sat Jul 20 17:21:11 2002
@@ -97,7 +97,7 @@
 /*---------------- time functions --------------------*/
 
 float 
-MPEGfile::sample_duration( Resolution res = LOW ) {
+MPEGfile::sample_duration( Resolution res) {
   //duration of one MPEG frame
   double frameDur = (1.0*samples_per_frame() / (1000.0 * samplingrate()));
 
@@ -147,7 +147,7 @@
 }
 
 unsigned int 
-MPEGfile::timeticks( Resolution res = LOW ) {
+MPEGfile::timeticks( Resolution res) {
   if ( layer() == III  ) {
     if ( res == LOW || res == PCM) {
       return 18;
@@ -164,7 +164,7 @@
 /*------------------- skip and analyse function -----------*/
 
 bool 
-MPEGfile::next_window( Resolution res = LOW ) {
+MPEGfile::next_window( Resolution res) {
   int nb_gr = nb_granules();
   DecodeLevel touse;
   //futur current window
@@ -272,8 +272,8 @@
 /*------------- access function ----------------*/
 
 double 
-MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0,
-		      Resolution res = LOW ) {
+MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb,
+		      Resolution res) {
   if ( res == HIGH && layer() == III) {
     return mdct_sample (ch,sb); //576 subbands
   } else {
@@ -283,7 +283,7 @@
 }
 
 unsigned int 
-MPEGfile::nb_subbands( Resolution res = LOW ) {
+MPEGfile::nb_subbands( Resolution res) {
   if ( layer() == III && res == HIGH ) {
     return 576;
   } else {
@@ -423,7 +423,7 @@
 
 //allow to parse next frame if available, keep windowNo up to date
 bool 
-MPEGfile::goTo_nextFrame( Resolution res = LOW) {
+MPEGfile::goTo_nextFrame( Resolution res) {
   if (!data_available()) return false;
   long oldfr = frameNo;
   while (frameNo == oldfr) {
@@ -732,7 +732,7 @@
 }
 
 short 
-MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss=0) {
+MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss) {
   return audio->pcm_sample(ch, sb, no, ss);
 }
 




--- src/mpeg/layer1.cc.orig	Thu Jan 10 00:32:43 2002
+++ src/mpeg/layer1.cc	Sat Jul 20 17:21:11 2002
@@ -235,25 +235,25 @@
 }
 
 float
-Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss=0) 
+Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss) 
 {
     return maaate_scalefactors[scale_index[channel][subband]];
 }
 
 int
-Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss=0) 
+Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss) 
 {
     return samples[number][channel][subb];
 }
 
 double
-Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0) 
+Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss) 
 {
     return restoredsamples[no][ch][subb];
 }
 
 short
-Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0) 
+Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss) 
 {
     return pcm[no][ch][subb];
 }




--- src/plugins/spectralFlux.cc.orig	Wed Jan 23 12:22:13 2002
+++ src/plugins/spectralFlux.cc	Sat Jul 20 17:21:11 2002
@@ -182,9 +182,9 @@
 
   //temporary results
   int SBM = mf->nb_subbands(LOW);
-  double temp[SBM];
-  double old_temp[SBM];
-  double (* aux)[SBM];
+  double btemp[SBM];
+  double bold_temp[SBM];
+  double *temp = btemp, *old_temp = bold_temp, **aux;
   double max = 0.0;
 
 




--- src/tier1/SOUNDfile.cc.orig	Mon Mar  4 03:31:29 2002
+++ src/tier1/SOUNDfile.cc	Sat Jul 20 17:21:11 2002
@@ -132,7 +132,7 @@
 
 //give the duration of one subband sample in sec
 float 
-SOUNDfile::sample_duration( Resolution res = LOW ) {
+SOUNDfile::sample_duration( Resolution res) {
   return format->sample_duration( res );
 }
 
@@ -164,7 +164,7 @@
 
 //give the nuber of subband samples in one window
 unsigned int 
-SOUNDfile::timeticks( Resolution res = LOW ) {
+SOUNDfile::timeticks( Resolution res) {
   return format->timeticks( res );
 }
 
@@ -194,7 +194,7 @@
 /*-------------- extract and skip --------------*/
 //go to next window and analyse it with res
 bool 
-SOUNDfile::next_window( Resolution res = LOW) {
+SOUNDfile::next_window( Resolution res) {
   //set which_max as maxim do not contain a meaningful value
   which_max = -1;
   return format->next_window( res );
@@ -212,20 +212,20 @@
 /*--------------- access function ---------------*/
 //give the value of the subband samples of the current window
 double 
-SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0, Resolution res = LOW ) {
+SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb, Resolution res) {
   return format->freq_value(ch,sb,nb,res);
 }
 
 //give the number of subband at that resolution
 unsigned int 
-SOUNDfile::nb_subbands( Resolution res = LOW ) {
+SOUNDfile::nb_subbands( Resolution res) {
   return format->nb_subbands( res );
 }
 
 /*------------- Analyse functions ----------------------*/
 //give the mean of samples nb in subband sb on both channels if available
 double 
-SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb = 0, Resolution res = LOW )
+SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb, Resolution res)
 {
   
   if ( format->is_stereo() ) { // in case of a stereo file it is possible to compute the mean
@@ -237,7 +237,7 @@
 
 //give the rms of samples nb in subband sb on both channels if available 
 double 
-SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb = 0, Resolution res = LOW) 
+SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb, Resolution res) 
 {
 
   if ( format->is_stereo() ) {  // in case of a stereo file it is possible to compute the rms
@@ -249,7 +249,7 @@
 
 //give the normalised subband energy samples
 double
-SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb = 0, Resolution res = LOW) 
+SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb, Resolution res) 
 {
   double resu;
 
@@ -293,7 +293,7 @@
 
 //give a coarse and quick idea of the value in that subband
 double 
-SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res = LOW)
+SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res)
 {
   switch (filetype) {
   case MPEG:
@@ -319,7 +319,7 @@
 
 //give the mean of samples over the current window
 double
-SOUNDfile::subband_mean( unsigned int sb, Resolution res = LOW) 
+SOUNDfile::subband_mean( unsigned int sb, Resolution res) 
 {
 
   int num = format->timeticks(res);
@@ -335,7 +335,7 @@
 
 //give the rms of samples over the current window
 double
-SOUNDfile::subband_rms( unsigned int sb, Resolution res = LOW) 
+SOUNDfile::subband_rms( unsigned int sb, Resolution res) 
 {
     
   int num = format->timeticks(res);
@@ -351,7 +351,7 @@
 
 //give the normalised subband energy over the current window  
 double
-SOUNDfile::subband_nrj( unsigned int sb, Resolution res = LOW) 
+SOUNDfile::subband_nrj( unsigned int sb, Resolution res) 
 {
   double resu;
 




--- src/tier2/segmentData.cc.orig	Mon Mar  4 03:31:29 2002
+++ src/tier2/segmentData.cc	Sat Jul 20 17:21:11 2002
@@ -27,8 +27,8 @@
 #include "segmentData.H"
 
 // constructor
-SegmentData::SegmentData(double t1, double t2, int col=0, int row=0, 
-			 int i=0, char f=' ', double cnf=0.0) : 
+SegmentData::SegmentData(double t1, double t2, int col, int row, 
+			 int i, char f, double cnf) : 
     starttime(t1), endtime(t2), columns(col), rows(row),
     id(i), flag(f), conf(cnf) {
 	if (col<0) col=0;
@@ -89,7 +89,7 @@
 // partial copy constructor
 SegmentData::SegmentData(const SegmentData& sd,
 			 int st_row, int end_row,
-			 int i=0, char f=' ', double cnf=0.0)
+			 int i, char f, double cnf)
 {
   int nb_rows;
 
@@ -309,7 +309,7 @@
 
 // minimum of all contained data
 double
-SegmentData::min(double downto = -DBL_MAX) {
+SegmentData::min(double downto ) {
 
   double * ptr;
 
@@ -332,7 +332,7 @@
 
 // maximum of all contained data
 double
-SegmentData::max(double upto = DBL_MAX) {
+SegmentData::max(double upto) {
 
   double * ptr;
 
@@ -363,7 +363,7 @@
 
 // normalize data values to [0;1], clipping outside of [downto;upto]
 bool
-SegmentData::normalise(double downto = - DBL_MAX, double upto = DBL_MAX) {
+SegmentData::normalise(double downto, double upto) {
 
   double * ptr;
 

Lines 12-20 Link Here

(-)audio/Maaate/pkg-plist (-1 / +5 lines)
12	include/Maaate/layer3.H	12	include/Maaate/layer3.H
13	include/Maaate/maaateM_brief.H	13	include/Maaate/maaateM_brief.H
14	include/Maaate/module.H	14	include/Maaate/module.H
		15	include/Maaate/mpegPlatform.h
15	include/Maaate/plugins.H	16	include/Maaate/plugins.H
		17	include/Maaate/pluginsPlatform.h
		18	include/Maaate/plugins_briefPlatform.h
16	include/Maaate/segmentData.H	19	include/Maaate/segmentData.H
17	include/Maaate/segmentTable.H	20	include/Maaate/segmentTable.H
		21	include/Maaate/tier1Platform.h
		22	include/Maaate/tier2Platform.h
18	include/Maaate/tools.H	23	include/Maaate/tools.H
19	include/MaaateA.h	24	include/MaaateA.h
20	include/MaaateMPEG.h	25	include/MaaateMPEG.h
Lines 32-38 Link Here
32	lib/libMaaateP.so	37	lib/libMaaateP.so
33	lib/libMaaateP.so.1	38	lib/libMaaateP.so.1
34	%%PORTDOCS%%share/doc/Maaate/API.html	39	%%PORTDOCS%%share/doc/Maaate/API.html
35	%%PORTDOCS%%share/doc/Maaate/COPYING
36	%%PORTDOCS%%share/doc/Maaate/ChangeLog	40	%%PORTDOCS%%share/doc/Maaate/ChangeLog
37	%%PORTDOCS%%share/doc/Maaate/THANKS	41	%%PORTDOCS%%share/doc/Maaate/THANKS
38	%%PORTDOCS%%share/doc/Maaate/applications.html	42	%%PORTDOCS%%share/doc/Maaate/applications.html

Return to bug 43691

Lines 7-14 Link Here

(-)audio/Maaate/Makefile (-5 / +7 lines)
7	#	7	#
8		8
9	PORTNAME= Maaate	9	PORTNAME= Maaate
10	PORTVERSION= 0.2.2	10	PORTVERSION= 0.3.0
11	PORTREVISION= 1
12	CATEGORIES= audio	11	CATEGORIES= audio
13	MASTER_SITES= http://www.cmis.csiro.au/maaate/packages/	12	MASTER_SITES= http://www.cmis.csiro.au/maaate/packages/
14		13
Lines 20-31 Link Here
20	INSTALLS_SHLIB= yes	19	INSTALLS_SHLIB= yes
21		20
22	post-patch:	21	post-patch:
23	@${REINPLACE_CMD} -e "s,-ldl,,g ; s,(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in	22	@${REINPLACE_CMD} -e 's\|-ldl\|\|g ; \
		23	s\|(CCLD\|(CXXLD\|g' ${WRKSRC}/demos/Makefile.in
24		24
25	post-install:	25	post-install:
26	.if !defined(NOPORTDOCS)	26	.if !defined(NOPORTDOCS)
27	@${MKDIR} ${PREFIX}/share/doc/Maaate	27	@${MKDIR} ${DOCSDIR}
28	@${CP} ${WRKSRC}/doc/* ${PREFIX}/share/doc/Maaate	28	.for file in API.html ChangeLog THANKS applications.html
		29	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
		30	.endfor
29	.endif	31	.endif
30		32
31	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-67 Link Here

(-)audio/Maaate/files/patch-src-mpeg-MPEGfile.cc (-67 lines)
1	--- src/mpeg/MPEGfile.cc.orig Mon Mar 4 03:31:28 2002
2	+++ src/mpeg/MPEGfile.cc Sat Jul 20 17:21:11 2002
3	@@ -97,7 +97,7 @@
4	/---------------- time functions --------------------/
5
6	float
7	-MPEGfile::sample_duration( Resolution res = LOW ) {
8	+MPEGfile::sample_duration( Resolution res) {
9	//duration of one MPEG frame
10	double frameDur = (1.0samples_per_frame() / (1000.0 samplingrate()));
11
12	@@ -147,7 +147,7 @@
13	}
14
15	unsigned int
16	-MPEGfile::timeticks( Resolution res = LOW ) {
17	+MPEGfile::timeticks( Resolution res) {
18	if ( layer() == III ) {
19	if ( res == LOW \|\| res == PCM) {
20	return 18;
21	@@ -164,7 +164,7 @@
22	/------------------- skip and analyse function -----------/
23
24	bool
25	-MPEGfile::next_window( Resolution res = LOW ) {
26	+MPEGfile::next_window( Resolution res) {
27	int nb_gr = nb_granules();
28	DecodeLevel touse;
29	//futur current window
30	@@ -272,8 +272,8 @@
31	/------------- access function ----------------/
32
33	double
34	-MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0,
35	- Resolution res = LOW ) {
36	+MPEGfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb,
37	+ Resolution res) {
38	if ( res == HIGH && layer() == III) {
39	return mdct_sample (ch,sb); //576 subbands
40	} else {
41	@@ -283,7 +283,7 @@
42	}
43
44	unsigned int
45	-MPEGfile::nb_subbands( Resolution res = LOW ) {
46	+MPEGfile::nb_subbands( Resolution res) {
47	if ( layer() == III && res == HIGH ) {
48	return 576;
49	} else {
50	@@ -423,7 +423,7 @@
51
52	//allow to parse next frame if available, keep windowNo up to date
53	bool
54	-MPEGfile::goTo_nextFrame( Resolution res = LOW) {
55	+MPEGfile::goTo_nextFrame( Resolution res) {
56	if (!data_available()) return false;
57	long oldfr = frameNo;
58	while (frameNo == oldfr) {
59	@@ -732,7 +732,7 @@
60	}
61
62	short
63	-MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss=0) {
64	+MPEGfile::pcm_sample (unsigned int ch, unsigned int sb, unsigned int no, unsigned int ss) {
65	return audio->pcm_sample(ch, sb, no, ss);
66	}
67

Lines 1-32 Link Here

(-)audio/Maaate/files/patch-src-mpeg-layer1.cc (-32 lines)
1	--- src/mpeg/layer1.cc.orig Thu Jan 10 00:32:43 2002
2	+++ src/mpeg/layer1.cc Sat Jul 20 17:21:11 2002
3	@@ -235,25 +235,25 @@
4	}
5
6	float
7	-Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss=0)
8	+Layer1::scalefactor (unsigned int channel, unsigned int subband, unsigned int ss)
9	{
10	return maaate_scalefactors[scale_index[channel][subband]];
11	}
12
13	int
14	-Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss=0)
15	+Layer1::sample (unsigned int channel, unsigned int subb, unsigned int number, unsigned int ss)
16	{
17	return samples[number][channel][subb];
18	}
19
20	double
21	-Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0)
22	+Layer1::restored_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss)
23	{
24	return restoredsamples[no][ch][subb];
25	}
26
27	short
28	-Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss=0)
29	+Layer1::pcm_sample (unsigned int ch, unsigned int subb, unsigned int no, unsigned int ss)
30	{
31	return pcm[no][ch][subb];
32	}

Lines 1-15 Link Here

(-)audio/Maaate/files/patch-src-plugins-spectralFlux.cc (-15 lines)
1	--- src/plugins/spectralFlux.cc.orig Wed Jan 23 12:22:13 2002
2	+++ src/plugins/spectralFlux.cc Sat Jul 20 17:21:11 2002
3	@@ -182,9 +182,9 @@
4
5	//temporary results
6	int SBM = mf->nb_subbands(LOW);
7	- double temp[SBM];
8	- double old_temp[SBM];
9	- double (* aux)[SBM];
10	+ double btemp[SBM];
11	+ double bold_temp[SBM];
12	+ double temp = btemp, old_temp = bold_temp, **aux;
13	double max = 0.0;
14
15

Lines 1-107 Link Here

(-)audio/Maaate/files/patch-src-tier1-SOUNDfile.cc (-107 lines)
1	--- src/tier1/SOUNDfile.cc.orig Mon Mar 4 03:31:29 2002
2	+++ src/tier1/SOUNDfile.cc Sat Jul 20 17:21:11 2002
3	@@ -132,7 +132,7 @@
4
5	//give the duration of one subband sample in sec
6	float
7	-SOUNDfile::sample_duration( Resolution res = LOW ) {
8	+SOUNDfile::sample_duration( Resolution res) {
9	return format->sample_duration( res );
10	}
11
12	@@ -164,7 +164,7 @@
13
14	//give the nuber of subband samples in one window
15	unsigned int
16	-SOUNDfile::timeticks( Resolution res = LOW ) {
17	+SOUNDfile::timeticks( Resolution res) {
18	return format->timeticks( res );
19	}
20
21	@@ -194,7 +194,7 @@
22	/-------------- extract and skip --------------/
23	//go to next window and analyse it with res
24	bool
25	-SOUNDfile::next_window( Resolution res = LOW) {
26	+SOUNDfile::next_window( Resolution res) {
27	//set which_max as maxim do not contain a meaningful value
28	which_max = -1;
29	return format->next_window( res );
30	@@ -212,20 +212,20 @@
31	/--------------- access function ---------------/
32	//give the value of the subband samples of the current window
33	double
34	-SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb = 0, Resolution res = LOW ) {
35	+SOUNDfile::freq_value( unsigned int ch, unsigned int sb, unsigned int nb, Resolution res) {
36	return format->freq_value(ch,sb,nb,res);
37	}
38
39	//give the number of subband at that resolution
40	unsigned int
41	-SOUNDfile::nb_subbands( Resolution res = LOW ) {
42	+SOUNDfile::nb_subbands( Resolution res) {
43	return format->nb_subbands( res );
44	}
45
46	/------------- Analyse functions ----------------------/
47	//give the mean of samples nb in subband sb on both channels if available
48	double
49	-SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb = 0, Resolution res = LOW )
50	+SOUNDfile::freqvalue_st_mean( unsigned int sb, unsigned int nb, Resolution res)
51	{
52
53	if ( format->is_stereo() ) { // in case of a stereo file it is possible to compute the mean
54	@@ -237,7 +237,7 @@
55
56	//give the rms of samples nb in subband sb on both channels if available
57	double
58	-SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb = 0, Resolution res = LOW)
59	+SOUNDfile::freqvalue_st_rms( unsigned int sb, unsigned int nb, Resolution res)
60	{
61
62	if ( format->is_stereo() ) { // in case of a stereo file it is possible to compute the rms
63	@@ -249,7 +249,7 @@
64
65	//give the normalised subband energy samples
66	double
67	-SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb = 0, Resolution res = LOW)
68	+SOUNDfile::normalised_sb_nrj( unsigned int sb, unsigned int nb, Resolution res)
69	{
70	double resu;
71
72	@@ -293,7 +293,7 @@
73
74	//give a coarse and quick idea of the value in that subband
75	double
76	-SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res = LOW)
77	+SOUNDfile::subband_scalefactor ( unsigned int sb, Resolution res)
78	{
79	switch (filetype) {
80	case MPEG:
81	@@ -319,7 +319,7 @@
82
83	//give the mean of samples over the current window
84	double
85	-SOUNDfile::subband_mean( unsigned int sb, Resolution res = LOW)
86	+SOUNDfile::subband_mean( unsigned int sb, Resolution res)
87	{
88
89	int num = format->timeticks(res);
90	@@ -335,7 +335,7 @@
91
92	//give the rms of samples over the current window
93	double
94	-SOUNDfile::subband_rms( unsigned int sb, Resolution res = LOW)
95	+SOUNDfile::subband_rms( unsigned int sb, Resolution res)
96	{
97
98	int num = format->timeticks(res);
99	@@ -351,7 +351,7 @@
100
101	//give the normalised subband energy over the current window
102	double
103	-SOUNDfile::subband_nrj( unsigned int sb, Resolution res = LOW)
104	+SOUNDfile::subband_nrj( unsigned int sb, Resolution res)
105	{
106	double resu;
107

Lines 1-49 Link Here

(-)audio/Maaate/files/patch-src-tier2-segmentData.cc (-49 lines)
1	--- src/tier2/segmentData.cc.orig Mon Mar 4 03:31:29 2002
2	+++ src/tier2/segmentData.cc Sat Jul 20 17:21:11 2002
3	@@ -27,8 +27,8 @@
4	#include "segmentData.H"
5
6	// constructor
7	-SegmentData::SegmentData(double t1, double t2, int col=0, int row=0,
8	- int i=0, char f=' ', double cnf=0.0) :
9	+SegmentData::SegmentData(double t1, double t2, int col, int row,
10	+ int i, char f, double cnf) :
11	starttime(t1), endtime(t2), columns(col), rows(row),
12	id(i), flag(f), conf(cnf) {
13	if (col<0) col=0;
14	@@ -89,7 +89,7 @@
15	// partial copy constructor
16	SegmentData::SegmentData(const SegmentData& sd,
17	int st_row, int end_row,
18	- int i=0, char f=' ', double cnf=0.0)
19	+ int i, char f, double cnf)
20	{
21	int nb_rows;
22
23	@@ -309,7 +309,7 @@
24
25	// minimum of all contained data
26	double
27	-SegmentData::min(double downto = -DBL_MAX) {
28	+SegmentData::min(double downto ) {
29
30	double * ptr;
31
32	@@ -332,7 +332,7 @@
33
34	// maximum of all contained data
35	double
36	-SegmentData::max(double upto = DBL_MAX) {
37	+SegmentData::max(double upto) {
38
39	double * ptr;
40
41	@@ -363,7 +363,7 @@
42
43	// normalize data values to [0;1], clipping outside of [downto;upto]
44	bool
45	-SegmentData::normalise(double downto = - DBL_MAX, double upto = DBL_MAX) {
46	+SegmentData::normalise(double downto, double upto) {
47
48	double * ptr;
49