[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23006] branches/blender2.5/blender/source /blender: 2.5: increase subversion to init new sound userpref variables.

[Brecht Van Lommel]

Revision: 23006
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23006
Author:   blendix
Date:     2009-09-04 23:34:17 +0200 (Fri, 04 Sep 2009)

Log Message:
-----------
2.5: increase subversion to init new sound userpref variables.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
    branches/blender2.5/blender/source/blender/editors/interface/resources.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h	2009-09-04 21:21:12 UTC (rev 23005)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h	2009-09-04 21:34:17 UTC (rev 23006)
@@ -43,7 +43,7 @@
 struct ReportList;
 
 #define BLENDER_VERSION			250
-#define BLENDER_SUBVERSION		2
+#define BLENDER_SUBVERSION		3
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-09-04 21:21:12 UTC (rev 23005)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-09-04 21:34:17 UTC (rev 23006)
@@ -9686,16 +9686,6 @@
 	bfd->user->uifonts.first= bfd->user->uifonts.last= NULL;
 	bfd->user->uistyles.first= bfd->user->uistyles.last= NULL;
 
-	// AUD_XXX that's bad because if the user has saved No Audio, it changes to OpenAL always
-	if(bfd->user->audiochannels == 0)
-		bfd->user->audiochannels = 2;
-	if(bfd->user->audiodevice == 0)
-		bfd->user->audiodevice = 2;
-	if(bfd->user->audioformat == 0)
-		bfd->user->audioformat = 0x24;
-	if(bfd->user->audiorate == 0)
-		bfd->user->audiorate = 44100;
-
 	bhead = blo_nextbhead(fd, bhead);
 
 		/* read all attached data */

Modified: branches/blender2.5/blender/source/blender/editors/interface/resources.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/resources.c	2009-09-04 21:21:12 UTC (rev 23005)
+++ branches/blender2.5/blender/source/blender/editors/interface/resources.c	2009-09-04 21:34:17 UTC (rev 23006)
@@ -1245,6 +1245,18 @@
 			SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0);
 		}
 	}
+
+	if (G.main->versionfile < 250 || (G.main->versionfile == 250 && G.main->subversionfile < 3)) {
+		/* new audio system */
+		if(U.audiochannels == 0)
+			U.audiochannels = 2;
+		if(U.audiodevice == 0)
+			U.audiodevice = 2;
+		if(U.audioformat == 0)
+			U.audioformat = 0x24;
+		if(U.audiorate == 0)
+			U.audiorate = 44100;
+	}
 	
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {