[Openh323-cvs] nsdk full_duplex.c,1.11,1.12 record.c,1.8,1.9 utils.c,1.37,1.38

[<der...@us...>]

Update of /cvsroot/openh323/nsdk
In directory sc8-pr-cvs1:/tmp/cvs-serv16599

Modified Files:
	full_duplex.c record.c utils.c 
Log Message:
Update so hookstate test "works" for when the speaker port is selected.


Index: full_duplex.c
===================================================================
RCS file: /cvsroot/openh323/nsdk/full_duplex.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** full_duplex.c	3 Jun 2003 00:53:38 -0000	1.11
--- full_duplex.c	30 Sep 2003 09:50:41 -0000	1.12
***************
*** 26,29 ****
--- 26,32 ----
  /*
   * $Log$
+  * Revision 1.12  2003/09/30 09:50:41  dereksmithies
+  * Update so hookstate test "works" for when the speaker port is selected.
+  *
   * Revision 1.11  2003/06/03 00:53:38  dereksmithies
   * Remove surplus thread creation code.
***************
*** 127,131 ****
    FillOneArg(commands.args, TYPE_GEN_OPT);
    FillOneArg(commands.args, TYPE_PLAYBACK_VOL);
!   
    atexit(closeall);
    printf("Press Ctrl -C if you need a quick exit\n");
--- 130,135 ----
    FillOneArg(commands.args, TYPE_GEN_OPT);
    FillOneArg(commands.args, TYPE_PLAYBACK_VOL);
!   FillOneArg(commands.args, TYPE_PORT_POTS);
! 
    atexit(closeall);
    printf("Press Ctrl -C if you need a quick exit\n");
***************
*** 142,147 ****
  
    ixj1 = OpenPhoneDevice(commands.args[TYPE_DEVICE].return_chr);
-   IXJ_IOCTL_VAL(ixj1, IXJCTL_PORT, PORT_POTS);
    SetToneTimes(ixj1, &commands);
  
    WaitForOffHook(ixj1, 1);
--- 146,151 ----
  
    ixj1 = OpenPhoneDevice(commands.args[TYPE_DEVICE].return_chr);
    SetToneTimes(ixj1, &commands);
+   SetPort(ixj1, &commands);
  
    WaitForOffHook(ixj1, 1);

Index: record.c
===================================================================
RCS file: /cvsroot/openh323/nsdk/record.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** record.c	4 Jun 2003 23:27:03 -0000	1.8
--- record.c	30 Sep 2003 09:50:41 -0000	1.9
***************
*** 30,33 ****
--- 30,36 ----
  /*
   * $Log$
+  * Revision 1.9  2003/09/30 09:50:41  dereksmithies
+  * Update so hookstate test "works" for when the speaker port is selected.
+  *
   * Revision 1.8  2003/06/04 23:27:03  dereksmithies
   * Remove 10 second limit, wait for hookswitch to go down
***************
*** 100,104 ****
    
    strcpy(commands.name, "record");
!   strcpy(commands.desc, "Record 10 seconds of data from port, or less if handset is put back on hook.");
  
    FillOneArg(commands.args, TYPE_DEVICE);
--- 103,107 ----
    
    strcpy(commands.name, "record");
!   strcpy(commands.desc, "Record data from port. Stop on Ctrl-C, or when handset is put back on hook.");
  
    FillOneArg(commands.args, TYPE_DEVICE);
***************
*** 125,129 ****
    recfile = OpenRecordFile(commands.args[TYPE_FILE].return_chr);
  
- 
    WaitForOffHook(ixj1, 1);
  
--- 128,131 ----
***************
*** 135,139 ****
    SetAecLevel(ixj1, &commands);
  
- 
    t1 = time(NULL);
    cnt = 0;
--- 137,140 ----
***************
*** 141,145 ****
    while(IsOffHook(ixj1) )  {
      size = read(ixj1, buff1, len);
- 
      t2 = time(NULL);
      printf("\rRead %d bytes of frame %d at time %ds      ", size, ++cnt, (int)(t2 - t1));
--- 142,145 ----

Index: utils.c
===================================================================
RCS file: /cvsroot/openh323/nsdk/utils.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** utils.c	24 Sep 2003 05:04:54 -0000	1.37
--- utils.c	30 Sep 2003 09:50:41 -0000	1.38
***************
*** 40,43 ****
--- 40,46 ----
  /*
   * $Log$
+  * Revision 1.38  2003/09/30 09:50:41  dereksmithies
+  * Update so hookstate test "works" for when the speaker port is selected.
+  *
   * Revision 1.37  2003/09/24 05:04:54  dereksmithies
   * Work on volume handling code,  Change defaults
***************
*** 1531,1537 ****
  }
  
- 
- 
- 
  void WaitForOffHook(int device, int isOffHook)
  {
--- 1534,1537 ----
***************
*** 1725,1728 ****
--- 1725,1731 ----
  int IsOffHook(int device)
  {
+   if (ioctl(device, IXJCTL_PORT, 0) != PORT_POTS)
+     return 1;
+ 
    return IXJ_IOCTL(device, PHONE_HOOKSTATE);
  }