Little changes for new PCM API.

diff --git a/Makefile b/Makefile
index a08141c92ad6e8fa370c7d916b94b6aa01173976..bf1367b5fd260e7005d0ed997ae3af40cf8c2c7d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,10 @@ clean:
        rm -f core .depend *.o *.orig *~
        rm -f `find . -name "out.txt"`
 
-pack: clean
-       rm -f config.cache config.log config.status Makefile.conf
+cvsclean: clean
+       rm -f config.cache config.log config.status Makefile.conf \
+              include/config.h utils/alsa-utils.spec configure
+
+pack: cvsclean
        chown -R root.root ../alsa-utils
        tar cvz -C .. -f ../alsa-utils-$(SND_UTIL_VERSION).tar.gz alsa-utils

diff --git a/aplay/Makefile b/aplay/Makefile
index f797589e6b6e482331de7faad52ab7c35a25dcb4..d10a1076ad2b29d647249919ffe4e54302311c52 100644 (file)
--- a/aplay/Makefile
+++ b/aplay/Makefile
@@ -21,7 +21,7 @@ $(TARGET): .depend $(OBJECTS)
        ln -sf $(TARGET) $(TARGET1)
 
 clean:
-       rm -f core .depend *.o *.orig *~
+       rm -f core aplay .depend *.o *.orig *~
 
 .depend:
        $(CPP) $(COPTS) $(INCLUDE) -M *.c > .depend

diff --git a/aplay/aplay.c b/aplay/aplay.c
index f50ef63b201951c8a5f3584c21fa7587d6e8d731..55835c4cd72ae599c2daaf6ffaf1147d959ce1ec 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -113,21 +113,19 @@ static void check_new_format( snd_pcm_format_t *format )
       fprintf( stderr, "%s: unsupported rate %iHz for playback (valid range is %iHz-%iHz)\n", command, format -> rate, pinfo.min_rate, pinfo.max_rate );
       exit( 1 );
     }
-    if ( format -> format != SND_PCM_SFMT_MU_LAW )
-      if ( !(pinfo.formats & (1 << format -> format)) ) {
-        fprintf( stderr, "%s: requested format %s isn't supported with hardware\n", command, get_format( format -> format ) );
-        exit( 1 );
-      }
+    if ( !(pinfo.formats & (1 << format -> format)) ) {
+      fprintf( stderr, "%s: requested format %s isn't supported with hardware\n", command, get_format( format -> format ) );
+      exit( 1 );
+    }
   } else {
     if ( rinfo.min_rate > format -> rate || rinfo.max_rate < format -> rate ) {
       fprintf( stderr, "%s: unsupported rate %iHz for record (valid range is %iHz-%iHz)\n", command, format -> rate, rinfo.min_rate, rinfo.max_rate );
       exit( 1 );
     }
-    if ( format -> format != SND_PCM_SFMT_MU_LAW )
-      if ( !(rinfo.formats & (1 << format -> format)) ) {
-        fprintf( stderr, "%s: requested format %s isn't supported with hardware\n", command, get_format( rformat.format ) );
-        exit( 1 );
-      }
+    if ( !(rinfo.formats & (1 << format -> format)) ) {
+      fprintf( stderr, "%s: requested format %s isn't supported with hardware\n", command, get_format( rformat.format ) );
+      exit( 1 );
+    }
   }
 }
 
@@ -209,7 +207,8 @@ static void device_list( void )
         printf( "    Formats:\n" );
         for ( idx = 0; idx < SND_PCM_SFMT_GSM; idx++ ) {
           if ( playinfo.formats & (1 << idx) )
-            printf( "      %s\n", get_format( idx ) ); 
+            printf( "      %s%s\n", get_format( idx ),
+               playinfo.hw_formats & (1 << idx) ? " [hardware]" : "" ); 
         }
         if ( (err = snd_ctl_pcm_record_info( handle, dev, &recinfo )) < 0 ) {
           printf( "Error: control digital audio record info (%i): %s\n", card, snd_strerror( err ) );
@@ -223,7 +222,8 @@ static void device_list( void )
         printf( "    Formats:\n" );
         for ( idx = 0; idx < SND_PCM_SFMT_GSM; idx++ ) {
           if ( recinfo.formats & (1 << idx) )
-            printf( "      %s\n", get_format( idx ) ); 
+            printf( "      %s%s\n", get_format( idx ),
+               recinfo.hw_formats & (1 << idx) ? " [hardware]" : "" ); 
         }
       }
     }

diff --git a/version b/version
index bbdeab6222cb8ad8ab423239cbeff9e6163d0d38..1750564f270b91dbcbd20a6e91b49ca281b350c3 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.0.5
+0.0.6