Attachment 23769 Details for Bug 40812 – file.diff

[patch] file.diff

file.diff (text/plain), 11.65 KB, created by corecode@corecode.ath.cx on 2002-07-20 17:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: corecode@corecode.ath.cx

Created: 2002-07-20 17:50:01 UTC

Size: 11.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/audio/Maaate/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- Makefile	8 Jul 2002 10:22:06 -0000	1.4
>+++ Makefile	20 Jul 2002 16:14:17 -0000
>@@ -14,12 +14,12 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> USE_REINPLACE=	yes
>-GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
>+USE_LIBTOOL=	yes
> INSTALLS_SHLIB=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -E -e "s,-ldl,,g ; s,\(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
>+	@${REINPLACE_CMD} -e "s,-ldl,,g ; s,(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
> 
> post-install:
> .if !defined(NOPORTDOCS)
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/audio/Maaate/pkg-plist,v
>retrieving revision 1.3
>diff -u -r1.3 pkg-plist
>--- pkg-plist	28 Mar 2002 16:17:54 -0000	1.3
>+++ pkg-plist	20 Jul 2002 16:37:17 -0000
>@@ -20,26 +20,22 @@
> include/MaaateMPEG.h
> include/MaaateP.h
> lib/Maaate/libMaaateM.a
>-lib/Maaate/libMaaateM.la
> lib/Maaate/libMaaateM.so
> lib/Maaate/libMaaateM.so.1
> lib/libMaaateA.a
>-lib/libMaaateA.la
> lib/libMaaateA.so
> lib/libMaaateA.so.1
> lib/libMaaateMPEG.a
>-lib/libMaaateMPEG.la
> lib/libMaaateMPEG.so
> lib/libMaaateMPEG.so.1
> lib/libMaaateP.a
>-lib/libMaaateP.la
> lib/libMaaateP.so
> lib/libMaaateP.so.1
>-@dirrm include/Maaate
>-@dirrm lib/Maaate
> %%PORTDOCS%%share/doc/Maaate/API.html
> %%PORTDOCS%%share/doc/Maaate/COPYING
> %%PORTDOCS%%share/doc/Maaate/ChangeLog
> %%PORTDOCS%%share/doc/Maaate/THANKS
> %%PORTDOCS%%share/doc/Maaate/applications.html
> %%PORTDOCS%%@dirrm share/doc/Maaate
>+@dirrm lib/Maaate
>+@dirrm include/Maaate
>Index: files/patch-src-mpeg-MPEGfile.cc
>===================================================================
>RCS file: files/patch-src-mpeg-MPEGfile.cc
>diff -N files/patch-src-mpeg-MPEGfile.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-mpeg-MPEGfile.cc	20 Jul 2002 15:21:32 -0000
>@@ -0,0 +1,67 @@
>+--- 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);
>+ }
>+ 
>Index: files/patch-src-mpeg-layer1.cc
>===================================================================
>RCS file: files/patch-src-mpeg-layer1.cc
>diff -N files/patch-src-mpeg-layer1.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-mpeg-layer1.cc	20 Jul 2002 15:21:32 -0000
>@@ -0,0 +1,32 @@
>+--- 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];
>+ }
>Index: files/patch-src-plugins-spectralFlux.cc
>===================================================================
>RCS file: files/patch-src-plugins-spectralFlux.cc
>diff -N files/patch-src-plugins-spectralFlux.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-plugins-spectralFlux.cc	20 Jul 2002 15:21:32 -0000
>@@ -0,0 +1,15 @@
>+--- 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;
>+ 
>+ 
>Index: files/patch-src-tier1-SOUNDfile.cc
>===================================================================
>RCS file: files/patch-src-tier1-SOUNDfile.cc
>diff -N files/patch-src-tier1-SOUNDfile.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-tier1-SOUNDfile.cc	20 Jul 2002 15:21:32 -0000
>@@ -0,0 +1,107 @@
>+--- 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;
>+ 
>Index: files/patch-src-tier2-segmentData.cc
>===================================================================
>RCS file: files/patch-src-tier2-segmentData.cc
>diff -N files/patch-src-tier2-segmentData.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-tier2-segmentData.cc	20 Jul 2002 15:21:32 -0000
>@@ -0,0 +1,49 @@
>+--- 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;
>+

Actions: View | Diff

Attachments on bug 40812: 23769