[PD-cvs] pd/src s_file.c,1.2.4.6,1.2.4.7

[Tim Blechmann]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19044

Modified Files:
      Tag: devel_0_38
	s_file.c 
Log Message:
miller's changes to stable

Index: s_file.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
retrieving revision 1.2.4.6
retrieving revision 1.2.4.7
diff -C2 -d -r1.2.4.6 -r1.2.4.7
*** s_file.c	14 Dec 2004 15:56:44 -0000	1.2.4.6
--- s_file.c	7 Jan 2005 12:23:26 -0000	1.2.4.7
***************
*** 157,161 ****
  static int sys_getpreference(const char *key, char *value, int size)
  {
!     HKEY hkey;
      DWORD bigsize = size;
      LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
--- 157,161 ----
  static int sys_getpreference(const char *key, char *value, int size)
  {
!     HKEY **hkey;
      DWORD bigsize = size;
      LONG err = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
***************
*** 185,189 ****
  static void sys_putpreference(const char *key, const char *value)
  {
!     HKEY hkey;
      LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE,
          "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE,
--- 185,189 ----
  static void sys_putpreference(const char *key, const char *value)
  {
!     HKEY **hkey;
      LONG err = RegCreateKeyEx(HKEY_LOCAL_MACHINE,
          "Software\\Pd", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE,
***************
*** 396,400 ****
  
      sys_get_audio_params(&naudioindev, audioindev, chindev,
! 	&naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler);
  
      if (naudioindev <= 0)
--- 396,400 ----
  
      sys_get_audio_params(&naudioindev, audioindev, chindev,
!         &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler);
  
      if (naudioindev <= 0)
***************
*** 427,430 ****
--- 427,432 ----
      sys_putpreference("scheduler", buf1);
  
+ 
+ 
          /* MIDI settings */
      sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);