1 diff -uNr audiocut-0.6.orig/Makefile audiocut-0.6/Makefile
2 --- audiocut-0.6.orig/Makefile Mon Sep 16 22:42:25 2002
3 +++ audiocut-0.6/Makefile Mon Sep 16 23:09:25 2002
5 $(cc) $(CFLAGS) -o split_wav.o -c split_wav.c
7 $(cc) $(LDFLAGS) cut_zero_end.o -o wavtrim -lsndfile -lm
8 - $(cc) $(LDFLAGS) printwav.o -o wavprint -lsndfile
9 - $(cc) $(LDFLAGS) cat_wav.o -o wavcat -lsndfile
10 - $(cc) $(LDFLAGS) time_wav.o -o wavtime -lsndfile
11 - $(cc) $(LDFLAGS) split_wav.o -o wavsplit -lsndfile
12 + $(cc) $(LDFLAGS) printwav.o -o wavprint -lsndfile -lm
13 + $(cc) $(LDFLAGS) cat_wav.o -o wavcat -lsndfile -lm
14 + $(cc) $(LDFLAGS) time_wav.o -o wavtime -lsndfile -lm
15 + $(cc) $(LDFLAGS) split_wav.o -o wavsplit -lsndfile -lm
19 diff -uNr audiocut-0.6.orig/cat_wav.c audiocut-0.6/cat_wav.c
20 --- audiocut-0.6.orig/cat_wav.c Mon Sep 11 19:17:27 2000
21 +++ audiocut-0.6/cat_wav.c Mon Sep 16 23:05:40 2002
24 for ( j = 3 ; j < argc; j++ ) {
25 filename = (char *)argv[j];
26 - audiofile = sf_open_read ( filename, &sfinfo ) ;
27 + audiofile = sf_open ( filename, SFM_READ, &sfinfo ) ;
28 if ( ! newaudiofile ) {
29 - newaudiofile = sf_open_write ( outfile , &sfinfo ) ;
30 + newaudiofile = sf_open ( outfile, SFM_WRITE, &sfinfo ) ;
33 - while ( i < sfinfo.samples ) {
34 + while ( i < sfinfo.frames ) {
35 inframes = sf_readf_short ( audiofile,(short *) &Frames , MAX_FRAMES ) ;
36 outframes = sf_writef_short ( newaudiofile, (short *)&Frames , inframes ) ;
38 diff -uNr audiocut-0.6.orig/cut_zero_end.c audiocut-0.6/cut_zero_end.c
39 --- audiocut-0.6.orig/cut_zero_end.c Sat Sep 16 14:54:55 2000
40 +++ audiocut-0.6/cut_zero_end.c Mon Sep 16 23:06:17 2002
43 position = sf_seek ( audiofile, 0 , SEEK_END ) ; // na konec datoteke
45 - last_usable = sfinfo->samples ;
46 + last_usable = sfinfo->frames ;
47 position = sf_seek ( audiofile, -i , SEEK_END ) ;
48 inframes = sf_readf_short ( audiofile, (short *) &Frame , 1 ) ;
53 filename = (char *)argv[3];
54 - audiofile = sf_open_read ( filename, &sfinfo ) ;
55 + audiofile = sf_open ( filename, SFM_READ, &sfinfo ) ;
56 max_ampl = get_max_ampl ( audiofile , &sfinfo) ;
57 max_cut = pow ( 10 , - gain/20 ) * 32767 ; // * max_ampl ;
58 first_usable = get_first_usable (max_cut,audiofile, &sfinfo) ;
59 fprintf (stderr, "Start at %d\n" , first_usable ) ;
60 last_usable = get_last_usable(max_cut,audiofile,&sfinfo) ;
61 - fprintf (stderr, "Finish at %d of %d\n" , last_usable, sfinfo.samples ) ;
62 + fprintf (stderr, "Finish at %d of %d\n" , last_usable, sfinfo.frames ) ;
64 sprintf ( outfile, "tmp%d.wav" , mypid );
65 - newaudiofile = sf_open_write ( outfile , &sfinfo ) ;
66 + newaudiofile = sf_open ( outfile, SFM_WRITE, &sfinfo ) ;
67 position = sf_seek ( audiofile, first_usable , SEEK_SET ) ;
70 diff -uNr audiocut-0.6.orig/printwav.c audiocut-0.6/printwav.c
71 --- audiocut-0.6.orig/printwav.c Wed Aug 30 10:58:44 2000
72 +++ audiocut-0.6/printwav.c Mon Sep 16 23:06:36 2002
75 filename = (char *)argv[1];
77 - audiofile = sf_open_read ( filename, &sfinfo ) ;
78 + audiofile = sf_open ( filename, SFM_READ, &sfinfo ) ;
79 printf ( "Sample Rate %d\n" , sfinfo.samplerate );
80 - printf ( "Samples %d\n" , sfinfo.samples );
81 + printf ( "Frames %d\n" , sfinfo.frames );
82 printf ( "Channels %d\n" , sfinfo.channels );
83 - printf ( "PCMbitwidth %d\n" , sfinfo.pcmbitwidth );
84 printf ( "Format 0x%0x\n" , sfinfo.format);
85 printf ( "Sections %d\n" , sfinfo.sections );
86 printf ( "Seekable %d\n" , sfinfo.seekable );
87 diff -uNr audiocut-0.6.orig/split_wav.c audiocut-0.6/split_wav.c
88 --- audiocut-0.6.orig/split_wav.c Mon Sep 11 19:17:57 2000
89 +++ audiocut-0.6/split_wav.c Mon Sep 16 23:07:19 2002
93 filename = (char *)argv[3];
94 - audiofile = sf_open_read ( filename, &sfinfo ) ;
95 + audiofile = sf_open ( filename, SFM_READ, &sfinfo ) ;
96 memcpy ( &leftinfo, &sfinfo , sizeof ( sfinfo ));
97 memcpy ( &rightinfo, &sfinfo , sizeof ( sfinfo ));
98 leftinfo.channels = 1 ;
99 rightinfo.channels = 1 ;
101 sprintf ( workfile , "%s.left" , outfile ) ;
102 - leftaudiofile = sf_open_write ( workfile , &leftinfo ) ;
103 + leftaudiofile = sf_open ( workfile, SFM_WRITE, &leftinfo ) ;
104 sprintf ( workfile , "%s.right" , outfile ) ;
105 - rightaudiofile = sf_open_write ( workfile , &rightinfo ) ;
106 + rightaudiofile = sf_open ( workfile , SFM_WRITE, &rightinfo ) ;
108 - while ( i < sfinfo.samples ) {
109 + while ( i < sfinfo.frames ) {
110 inframes = sf_readf_short ( audiofile,(short *) &Frames , MAX_FRAMES ) ;
111 for ( j=0 ; j<inframes; j++ ) {
112 outframes = sf_writef_short ( leftaudiofile, (short *)&Frames[j].left , 1 );
113 diff -uNr audiocut-0.6.orig/time_wav.c audiocut-0.6/time_wav.c
114 --- audiocut-0.6.orig/time_wav.c Sat Sep 9 10:45:05 2000
115 +++ audiocut-0.6/time_wav.c Mon Sep 16 23:07:37 2002
119 filename = (char *)argv[1];
120 - audiofile = sf_open_read ( filename, &sfinfo ) ;
121 - time = sfinfo.samples / sfinfo.samplerate ;
122 + audiofile = sf_open ( filename, SFM_READ, &sfinfo ) ;
123 + time = sfinfo.frames / sfinfo.samplerate ;
126 fprintf ( stdout, "%02d:%02d\n" , min , sec) ;