Attachment 29374 Details for Bug 49056 – file.diff

[patch] file.diff

file.diff (text/plain), 2.70 KB, created by Joel Ray Holveck on 2003-03-09 21:20:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Ray Holveck

Created: 2003-03-09 21:20:13 UTC

Size: 2.70 KB

patch

obsolete

>--- speech_tools/audio/voxware.cc	Tue Sep 28 09:38:22 1999
>+++ speech_tools/audio/voxware.cc	Sat Mar  8 18:55:29 2003
>@@ -114,9 +114,11 @@
> {
>     int fmt;
>     int sfmts;
>+    int chans = 1;
> 
>     ioctl(sbdevice,SNDCTL_DSP_RESET,0);
>     ioctl(sbdevice,SNDCTL_DSP_SPEED,&samp_rate);
>+    ioctl(sbdevice,SNDCTL_DSP_CHANNELS,&chans);
>     ioctl(sbdevice,SNDCTL_DSP_GETFMTS,&sfmts);
> 
>     if (sfmts == AFMT_U8)
>--- speech_tools/base_class/EST_Pathname_unix.cc	Mon May 31 10:38:45 1999
>+++ speech_tools/base_class/EST_Pathname_unix.cc	Sat Mar  8 17:04:00 2003
>@@ -126,7 +126,7 @@
> 	  struct stat buf;
> 
> 	  if (check_for_directories && 
>-	      stat((EST_String)this->as_directory() + name, &buf)==0 && 
>+	      stat((EST_String)(this->as_directory() + name), &buf)==0 && 
> 	      (buf.st_mode & S_IFDIR))
> 	    list.append(name.as_directory());
> 	  else
>--- speech_tools/base_class/EST_TBuffer.cc	Sun May 30 06:50:31 1999
>+++ speech_tools/base_class/EST_TBuffer.cc	Sat Mar  8 17:16:51 2003
>@@ -41,6 +41,7 @@
> 
> #include <stdlib.h>
> #include <stdio.h>
>+#include <string.h>
> #include "EST_unix.h"
> #include "EST_TBuffer.h"
> 
>--- speech_tools/include/ling_class/EST_Relation.h	Fri Oct 22 06:04:41 1999
>+++ speech_tools/include/ling_class/EST_Relation.h	Sat Mar  8 15:37:34 2003
>@@ -190,7 +190,7 @@
>     EST_Item *prepend(EST_Item *si);
>     EST_Item *prepend(); 
> 
>-    friend EST_Item;
>+    friend class EST_Item;
> };
> 
> VAL_REGISTER_CLASS_DCLS(relation,EST_Relation)
>--- speech_tools/include/rxp/dtd.h	Fri Jul 24 08:12:26 1998
>+++ speech_tools/include/rxp/dtd.h	Sat Mar  8 16:48:18 2003
>@@ -201,8 +201,8 @@
> XML_API Entity DefineEntity(Dtd dtd, Entity entity, int pe);
> XML_API Entity FindEntityN(Dtd dtd, const Char *name, int namelen, int pe);
> 
>-#define NewExternalEntity(name, pub, sys, not, parent) \
>-    NewExternalEntityN(name, name ? Strlen(name) : 0, pub, sys, not, parent)
>+#define NewExternalEntity(name, pub, sys, neg, parent) \
>+    NewExternalEntityN(name, name ? Strlen(name) : 0, pub, sys, neg, parent)
> #define NewInternalEntity(name, test, parent, l, l1, mat) \
>     NewInternalEntityN(name, name ? Strlen(name) : 0, test, parent, l, l1, mat)
> #define FindEntity(dtd, name, pe) FindEntityN(dtd, name, Strlen(name), pe)
>--- speech_tools/testsuite/named_enum_example.cc	Tue Jun 15 10:59:19 1999
>+++ speech_tools/testsuite/named_enum_example.cc	Sat Mar  8 17:34:32 2003
>@@ -160,11 +160,11 @@
>       cout << nm << " is " << (int)c
> 	   << " = " << ColourMap.name(c) 
> 	   << " (" << (spanish?spanish:"[NULL]") << " in Spanish)"
>-	   << " = {" << hex
>+	   << " = {"
> 	   << info.red << ", "
> 	   << info.green << ", "
> 	   << info.blue
>-	   << dec << "}\n";
>+	   << "}\n";
>     }
> 
>   // In the special case of EST_TNamedEnum (i.e. simple mappings from

Actions: View | Diff

Attachments on bug 49056: 29374 | 29375 | 29376