diff -urN bonk-0.6/bonk.cc bonk-0.6-shntool/bonk.cc
--- bonk-0.6/bonk.cc	2002-06-22 23:58:57.000000000 -0400
+++ bonk-0.6-shntool/bonk.cc	2007-06-11 00:04:59.000000000 -0400
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -540,25 +539,6 @@
   }
 };
 
-FILE *open_dsp(int rate,bool stereo) {
-  int device = open(dsp_device,O_WRONLY);
-  if (device < 0)
-    throw error("Couldn't open sound device");
-    
-  int format = AFMT_S16_NE;
-  if (ioctl(device,SNDCTL_DSP_SETFMT,&format) < 0)
-    throw error("Couldn't set up sound device");
-
-  int is_stereo = stereo ? 1 : 0;
-  if (ioctl(device,SNDCTL_DSP_STEREO,&is_stereo) < 0)
-    throw error("Couldn't set up sound device");
-  
-  if (ioctl(device,SNDCTL_DSP_SPEED,&rate) < 0)
-    throw error("Couldn't set up sound device");
-
-  return fdopen(device,"wb"); 
-}
-
 bool has_parameter(int &argc,char **&argv,char *name,char *&value) {
   for(int i=1;i<argc-1;i++) {
     if (strcasecmp(argv[i],name) == 0) {
@@ -586,71 +566,6 @@
   return false;
 }
 
-void play_file(char *name) {
-  fprintf(stderr,"%s\n",name);
-
-  decoder deco;
-
-  FILE *f_in  = fopen(name,"rb");
-  if (!f_in)
-    throw error("Couldn't open file");
-
-  deco.begin(f_in);
-
-  if (deco.channels > 2)
-    throw error("Don't know how to play more than 2 channels");
-
-  FILE *f_out = open_dsp(deco.rate,deco.channels>1); 
-
-  while(deco.length_remaining) {
-    vector<int> samples;
-    deco.read_packet(samples);
-
-    vector<int16> little_samples(samples.size());
-    for(int i=0;i<samples.size();i++) {
-      if (samples[i] >  32767) 
-        little_samples[i] =  32767;
-      else if (samples[i] < -32768) 
-        little_samples[i] = -32768;
-      else                          
-        little_samples[i] =  samples[i];
-    }
-    fwrite(&(little_samples[0]),2,little_samples.size(),f_out);
-    fflush(f_out);
-  }
-
-  fclose(f_in);
-  fclose(f_out);
-}
-
-void do_play(int argc,char **argv) {
-  bool loop = false, random = false;
-
-  for(;;)
-    if (has_flag(argc,argv,"-r"))
-      random = true;
-    else if (has_flag(argc,argv,"-l"))
-      loop = true;
-    else break;
-
-  if (argc <= 2)
-    return;
-
-  do {
-    if (random)
-      for(int i=2;i<argc;i++) {
-        int j = rand()%(argc-2)+2;
-	char *temp = argv[i];
-	argv[i] = argv[j];
-	argv[j] = temp;
-      }
-
-    for(int i=2;i<argc;i++) {
-      play_file(argv[i]);
-    }
-  } while(loop);
-}
-
 void do_decode(int argc,char **argv) {
   char *out_name;
   bool out_name_specified = false;
@@ -678,13 +593,21 @@
 
     decoder deco;
 
-    FILE *f_in  = fopen(argv[i],"rb");
+    FILE *f_in = stdin;
+
+    if (strcmp(argv[i],"-"))
+      f_in = fopen(argv[i],"rb");
+
     if (!f_in)
       throw error("Couldn't open input file");
 
     deco.begin(f_in);
 
-    FILE *f_out = fopen(out_name,"wb");
+    FILE *f_out = stdout;
+
+    if (strcmp(out_name,"-"))
+      f_out = fopen(out_name,"wb");
+
     if (!f_out)
       throw error("Couldn't open output file");
 
@@ -709,8 +632,10 @@
       fflush(stderr);
     }
 
-    fclose(f_in);
-    fclose(f_out);
+    if (strcmp(argv[i],"-"))
+      fclose(f_in);
+    if (strcmp(out_name,"-"))
+      fclose(f_out);
 
     fprintf(stderr,"\r                        \r");
     fflush(stderr);
@@ -808,14 +733,22 @@
     fprintf(stderr, "Encoding %s\n"
                     "      to %s\n\n",argv[i],out_name);
 
-    FILE *f_in = fopen(argv[i],"rb");
+    FILE *f_in = stdin;
+
+    if (strcmp(argv[i],"-"))
+      f_in = fopen(argv[i],"rb");
+
     if (!f_in)
       throw error("Couldn't open input file");
 
     int channels,rate,length;
     read_wav_header(f_in,channels,rate,length);
 
-    FILE *f_out = fopen(out_name,"wb");
+    FILE *f_out = stdout;
+
+    if (strcmp(out_name,"-"))
+      f_out = fopen(out_name,"wb");
+
     if (!f_out)
       throw error("Couldn't open output file");
 
@@ -869,8 +802,10 @@
 
     enco.finish();
 
-    fclose(f_in);
-    fclose(f_out);
+    if (strcmp(argv[i],"-"))
+      fclose(f_in);
+    if (strcmp(out_name,"-"))
+      fclose(f_out);
 
     fprintf(stderr,"\r                                               \r");
     fprintf(stderr,"Encoded at %.1f:1 compression (%.0f kbps)\n\n",
@@ -890,8 +825,6 @@
       do_encode(argc,argv);
     } else if (argc >= 2 && strcmp(argv[1],"decode") == 0) {
       do_decode(argc,argv);
-    } else if (argc >= 2 && strcmp(argv[1],"play") == 0) {
-      do_play(argc,argv);
     } else {
       fprintf(stderr,
              "[ Bonk lossy/lossless audio compressor (version %s) ]\n\n"
@@ -918,12 +851,7 @@
 	     "[ Decoding back to WAV format ]\n\n"
 	     "  bonk decode [options] file1.bonk file2.bonk ...\n\n"
 	     "  Options:\n"
-	     "    -o file.wav  Write output to file.wav\n\n"
-	     "[ Playing BONK format files ]\n\n"
-	     "  bonk play [options] file1.bonk file2.bonk ...\n\n"
-	     "  Options:\n"
-	     "    -r           Random order\n"
-	     "    -l           Loop\n",
+	     "    -o file.wav  Write output to file.wav\n\n",
 	     version
 	     );
     }