File kwaveview-1.1.4.dif of Package kalsatools

--- kwaveview-1.1.4/capture.cpp
+++ kwaveview-1.1.4/capture.cpp	2003/12/09 00:50:20
@@ -20,7 +20,7 @@
   int pcmreturn;
 
   while(adata->doCapture) {
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
     while ((pcmreturn = snd_pcm_readi(adata->pcm_capture_handle, adata->buf + adata->writeofs, adata->frames)) < 0) {
       snd_pcm_prepare(adata->pcm_capture_handle);
       fprintf(stderr, "<<<<<<<<<<<<<<< Buffer Overrun >>>>>>>>>>>>>>>\n");
--- kwaveview-1.1.4/kwaveview.cpp
+++ kwaveview-1.1.4/kwaveview.cpp	2003/12/09 00:51:47
@@ -19,7 +19,7 @@
 KWaveView::KWaveView(QWidget *parent, const char *name) : QVBox(parent, name) {
   
   aboutWidget = new QMessageBox(this);
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
   PCMname =  DEFAULT_PCMNAME;
   open_seq();
   initSeqNotifier();
@@ -103,7 +103,7 @@
   return(adata->channels);
 }
 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
 int KWaveView::setPCMname(QString p_name){
 
   PCMname = p_name;
@@ -126,7 +126,7 @@
 
 #endif
 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
 
 void KWaveView::open_seq() {
 
@@ -164,7 +164,7 @@
   
   snd_pcm_t *pcm_handle;
 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
   snd_pcm_stream_t stream_capture = SND_PCM_STREAM_CAPTURE;
   snd_pcm_hw_params_t *hwparams;
 
@@ -237,7 +237,7 @@
   return(pcm_handle);
 }
 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1   
 
 void KWaveView::midiAction(int fd) {
 
--- kwaveview-1.1.4/kwaveview.h
+++ kwaveview-1.1.4/kwaveview.h	2003/12/09 00:52:16
@@ -16,7 +16,7 @@
 #include "scope.h"
 #include "spectrum.h"
 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
 #define DEFAULT_PCMNAME    "plughw:0,0"
 #else
 #define DEFAULT_CARD                0
@@ -37,7 +37,7 @@
     Spectrum *spectrum;
     QMessageBox *aboutWidget;
     Capture *capture;
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
     QString PCMname;
     snd_seq_t *seq_handle;
 #else
@@ -53,7 +53,7 @@
     int setPeriods(int periods);
     int setRate(int rate);
     int setChannels(int channels);
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
     int setPCMname(QString name);
     void open_seq();
     int initSeqNotifier();    
@@ -66,10 +66,10 @@
   public slots: 
     void displayAbout();
     void displaySpectrum();
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
     void midiAction(int fd);
 #endif    
 };
   
 #endif
-      
\ No newline at end of file
+      
--- kwaveview-1.1.4/main.cpp
+++ kwaveview-1.1.4/main.cpp	2003/12/09 00:52:36
@@ -14,7 +14,7 @@
          {"frag", 1, 0, 'f'},   
          {"rate", 1, 0, 'r'},   
          {"help", 0, 0, 'h'},
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
          {"soundcard", 1, 0, 'c'},
 #else
          {"soundcard", 1, 0, 'c'},
@@ -35,7 +35,7 @@
   KWaveView *kwaveview = new KWaveView(view);
   int getopt_return;
   int option_index; 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
   while((getopt_return = getopt_long(argc, argv, "hb:f:c:r:", options, &option_index)) >= 0) {
 #else
   while((getopt_return = getopt_long(argc, argv, "hb:f:c:d:r:", options, &option_index)) >= 0) {
@@ -51,7 +51,7 @@
         kwaveview->setRate(atoi(optarg));
         break;
     case 'c': 
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
         kwaveview->setPCMname(optarg);
         break; 
 #else
@@ -66,7 +66,7 @@
         printf("--bufsize <bytes>            Buffersize [16384]\n");
         printf("--frag <num>                 Number of fragments [2]\n");
         printf("--rate <samples/s>           Samplerate [44100]\n");
-#if SND_LIB_MINOR >= 6
+#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR >= 1
         printf("--soundcard <plug>           Soundcard [plughw:0,0]\n\n");
 #else
         printf("--soundcard <num>            Soundcard number [0]\n");
--- kwaveview-1.1.4/make_kwaveview
+++ kwaveview-1.1.4/make_kwaveview	2003/12/09 00:49:43
@@ -1,5 +1,5 @@
-QT_LIB_DIR=-L/usr/lib/qt3/lib
-X11_LIB_DIR=-L/usr/X11R6/lib
+QT_LIB_DIR=-L/usr/lib/qt3/lib64 -L/usr/lib/qt3/lib
+X11_LIB_DIR=-L/usr/X11R6/lib64 -L/usr/X11R6/lib
 
 kwaveview: capture.o audiodata.o scope.o scope.moc.o \
 	spectrum.o spectrum.moc.o \
@@ -15,7 +15,7 @@
 	$(QT_LIB_DIR) $(X11_LIB_DIR) \
 	-lqt-mt -lasound -lsrfftw -lsfftw -lm
 
-CXXFLAGS=-DQT_THREAD_SUPPORT -I/usr/lib/qt3/include -I/usr/X11R6/include -I. -O -g -Wall
+CXXFLAGS=-DQT_THREAD_SUPPORT -I/usr/lib/qt3/include -I/usr/X11R6/include -I. $(RPM_OPT_FLAGS) -g -Wall
 
 capture.o: capture.cpp capture.h audiodata.h
 audiodata.o: audiodata.cpp audiodata.h