### patch number: 8
### area:	audio.h AFUtil library and adial
### severity:	medium
### comments: 	patch using command "(cd <audio_root> ; patch -p < thisfile)"

*** patchlevel.h        Wed Mar  3 11:17:37 1993
--- /crl/audio/patchlevel.h     Wed Mar  3 10:18:07 1993
***************
*** 1 ****
! #define       PATCHLEVEL      7
--- 1 ----
! #define       PATCHLEVEL      8
*** ./AF/include/audio.h	Sun Feb  7 18:31:40 1993
--- /crl/audio/./AF/include/audio.h	Tue Mar  2 09:48:06 1993
***************
*** 124,132 ****
      ALAW = 1,	    /* Log PCM representation, encoded in 8 bits.	*/
      LIN16 = 2,	    /* Linear PCM, 16 bits, -1.0 <= x < 1.0		*/
      LIN32 = 3,	    /* Linear PCM, 32 bits, -1.0 <= x < 1.0		*/
!     ADPCM32 = 4,    /* G.721, 64Kbps to/from 32Kbps.			*/
!     ADPCM24 = 5,    /* G.723, 64Kbps to/from 32Kbps.			*/
!     UNKNOWN_ENCODETYPE = 6
  } AEncodeType;
  /*
   * device types.
--- 124,142 ----
      ALAW = 1,	    /* Log PCM representation, encoded in 8 bits.	*/
      LIN16 = 2,	    /* Linear PCM, 16 bits, -1.0 <= x < 1.0		*/
      LIN32 = 3,	    /* Linear PCM, 32 bits, -1.0 <= x < 1.0		*/
!     G721 = 4,       /* G.721, 64Kbps to/from 32Kbps.			*/
!     G723 = 5,       /* G.723, 64Kbps to/from 24Kbps.			*/
!     UNKNOWN_ENCODETYPE = 6,    /* who knows?                            */
!     IMA = 7,        /* 4 bit/sample ADPCM                               */
!     CRLADPCM2 = 8,  /* 2 bit/sample ADPCM                               */
!     CRLADPCM3 = 9,  /* 3 bit/sample ADPCM                               */
!     CRLADPCM4 = 10, /* 4 bit/sample ADPCM                               */
!     LPC10 = 11,     /* LPC10e 2400 bps                                  */
!     CELP1016 = 12,  /* 4800 bps                                         */
!     IEEES = 13,     /* IEEE single precision floating point             */
!     IEEED = 14,     /* IEEE double precision floating point             */
!     G722_8 = 15,    /* 64 Kbps 7 KHz audio                              */
!     MPEG = 16       /* MPEG-audio                                       */
  } AEncodeType;
  /*
   * device types.
*** ./AF/lib/AFUtil/AF_samples.c	Sun Feb  7 16:29:54 1993
--- /crl/audio/./AF/lib/AFUtil/AF_samples.c	Mon Mar  1 14:39:49 1993
***************
*** 50,55 ****
    { 16, 2, 1, "PCM-16"},
    { 32, 4, 1, "PCM-32"},
    { 4, 1, 2, "G.721"},
!   { 8, 1, 1, "G.723"},
!   {0, 0, 0, 0}
  };
--- 50,66 ----
    { 16, 2, 1, "PCM-16"},
    { 32, 4, 1, "PCM-32"},
    { 4, 1, 2, "G.721"},
!   { 3, 3, 8, "G.723"},
!   { 0, 0, 0, "unknown"},
!   { 4, 1, 2, "IMA" },
!   { 2, 1, 4, "crladpcm2"},
!   { 3, 3, 8, "crladpcm3"},
!   { 4, 1, 2, "crladpcm4"},
!   { 0, 0, 0, "LPC10e"},
!   { 0, 18, 240, "CELP1016"},
!   { 32, 4, 1, "IEEES" },
!   { 64, 8, 1, "IEEED" },
!   { 8, 1, 1, "G.722" },
!   { 0, 0, 0, "MPEG" },
!   { 0, 0, 0, 0L }
  };
*** ./AF/contrib/clients/adial/adial	Thu Feb 11 16:18:16 1993
--- /crl/audio/./AF/contrib/clients/adial/adial	Tue Mar  2 13:01:56 1993
***************
*** 75,80 ****
--- 75,82 ----
  
  The Hangup button will disconnect the call.
  
+ The pickup button will answer a call without dialling anything.
+ 
  Larry Stewart
  stewart@crl.dec.com
  }
***************
*** 102,107 ****
--- 104,114 ----
  	exec ahs on
  }
  
+ proc pickup {} {
+ 	exec ahs off
+ 	exec aset -device 0 +pass 0
+ }
+ 
  set rewrite "-n"
  entry .num -relief sunken
  
***************
*** 120,126 ****
--- 127,135 ----
  
  button .dial -command dial -text dial
  button .hang -command hangup -text hangup
+ button .pickup -command pickup -text pickup
  pack append . .file left
  pack append . .num left
  pack append . .dial left
+ pack append . .pickup left
  pack append . .hang left
*** ./AF/contrib/clients/adial/adial.man	Fri Feb  5 21:45:03 1993
--- /crl/audio/./AF/contrib/clients/adial/adial.man	Tue Mar  2 13:02:47 1993
***************
*** 10,19 ****
  
  The application picks up the telephone using ahs(1) and dials
  the phone using aphone(1).  After that, a through audio connection
! is made to the local handset.  
  .TP
  If the entry box is empty, then the current X selection is used
! as the number.
  .TP
  The entry (or selection) is translated by aname2num(1) before
  being dialled.  See aname2num for details, but briefly,
--- 10,20 ----
  
  The application picks up the telephone using ahs(1) and dials
  the phone using aphone(1).  After that, a through audio connection
! is made to the local handset or headset using aset(1).
  .TP
  If the entry box is empty, then the current X selection is used
! as the number.  You can type ^U in the entry box to delete whatever
! is there.
  .TP
  The entry (or selection) is translated by aname2num(1) before
  being dialled.  See aname2num for details, but briefly,
***************
*** 21,26 ****
--- 22,30 ----
  .TP
  When the call is finished, click Hangup.
  .TP
+ If you just want to answer the phone, click Pickup.  Then use Hangup to 
+ disconnect.
+ .TP
  This program is implemented with the Tcl/Tk toolkit, which must be installed 
  on your system for the program to run.
  .SH RESTRICTIONS
***************
*** 41,43 ****
--- 45,48 ----
  See \fIAudioFile(1)\fP for a full statement of rights and permissions.
  .SH AUTHOR
  Larry Stewart, DEC Cambridge Research Lab
+