[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41448] trunk/blender/source/blender: == Removal of SpaceSound ==

Thomas Dinges blender at dingto.org
Tue Nov 1 20:48:46 CET 2011


Revision: 41448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41448
Author:   dingto
Date:     2011-11-01 19:48:45 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
== Removal of SpaceSound ==
* Removed old, unused Space Sound space
* Removed data struct and Theme settings
* Old files with an open Audio window will be loaded as Info Space

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/editors/CMakeLists.txt
    trunk/blender/source/blender/editors/SConscript
    trunk/blender/source/blender/editors/animation/anim_markers.c
    trunk/blender/source/blender/editors/include/ED_space_api.h
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/space_api/spacetypes.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/python/simple_enum_gen.py

Removed Paths:
-------------
    trunk/blender/source/blender/editors/space_sound/

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -4990,11 +4990,6 @@
 							}
 						}
 					}
-					else if(sl->spacetype==SPACE_SOUND) {
-						SpaceSound *ssound= (SpaceSound *)sl;
-
-						ssound->sound= newlibadr_us(fd, sc->id.lib, ssound->sound);
-					}
 					else if(sl->spacetype==SPACE_NODE) {
 						SpaceNode *snode= (SpaceNode *)sl;
 						
@@ -5217,11 +5212,6 @@
 						}
 					}
 				}
-				else if(sl->spacetype==SPACE_SOUND) {
-					SpaceSound *ssound= (SpaceSound *)sl;
-
-					ssound->sound= restore_pointer_by_name(newmain, (ID *)ssound->sound, 1);
-				}
 				else if(sl->spacetype==SPACE_NODE) {
 					SpaceNode *snode= (SpaceNode *)sl;
 					
@@ -6609,16 +6599,6 @@
 				//ar->v2d.flag |= V2D_IS_INITIALISED;
 				break;
 			}
-			case SPACE_SOUND:
-			{
-				SpaceSound *ssound= (SpaceSound *)sl;
-				memcpy(&ar->v2d, &ssound->v2d, sizeof(View2D));
-				
-				ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
-				ar->v2d.scroll |= (V2D_SCROLL_LEFT);
-				//ar->v2d.flag |= V2D_IS_INITIALISED;
-				break;
-			}
 			case SPACE_NLA:
 			{
 				SpaceNla *snla= (SpaceNla *)sl;
@@ -6740,6 +6720,12 @@
 				sl->spacetype= SPACE_EMPTY;	/* spacedata then matches */
 		}
 		
+		/* space sound is deprecated */
+		for(sl= sa->spacedata.first; sl; sl= sl->next) {
+			if(sl->spacetype==SPACE_SOUND)
+				sl->spacetype= SPACE_EMPTY;	/* spacedata then matches */
+		}
+		
 		/* it seems to be possible in 2.5 to have this saved, filewindow probably */
 		sa->butspacetype= sa->spacetype;
 		

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -2216,9 +2216,6 @@
 				else if(sl->spacetype==SPACE_ACTION) {
 					writestruct(wd, DATA, "SpaceAction", 1, sl);
 				}
-				else if(sl->spacetype==SPACE_SOUND) {
-					writestruct(wd, DATA, "SpaceSound", 1, sl);
-				}
 				else if(sl->spacetype==SPACE_NLA){
 					SpaceNla *snla= (SpaceNla *)sl;
 					

Modified: trunk/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/CMakeLists.txt	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/CMakeLists.txt	2011-11-01 19:48:45 UTC (rev 41448)
@@ -46,7 +46,6 @@
 	add_subdirectory(space_outliner)
 	add_subdirectory(space_script)
 	add_subdirectory(space_sequencer)
-	add_subdirectory(space_sound)
 	add_subdirectory(space_text)
 	add_subdirectory(space_time)
 	add_subdirectory(space_userpref)

Modified: trunk/blender/source/blender/editors/SConscript
===================================================================
--- trunk/blender/source/blender/editors/SConscript	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/SConscript	2011-11-01 19:48:45 UTC (rev 41448)
@@ -25,7 +25,6 @@
             'space_outliner/SConscript',
             'space_time/SConscript',
             'space_view3d/SConscript',
-            'space_sound/SConscript',
             'space_action/SConscript',
             'space_nla/SConscript',
             'space_script/SConscript',

Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -777,7 +777,7 @@
 				
 				fac= ((float)(evt->x - mm->firstx)*dx);
 				
-				if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) 
+				if (mm->slink->spacetype == SPACE_TIME) 
 					apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, FPS, 0.1*FPS, 0);
 				else
 					apply_keyb_grid(evt->shift, evt->ctrl, &fac, 0.0, 1.0, 0.1, 0 /*was: U.flag & USER_AUTOGRABGRID*/);
@@ -796,7 +796,7 @@
 				
 				if (totmark==1) {	
 					/* we print current marker value */
-					if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) {
+					if (mm->slink->spacetype == SPACE_TIME) {
 						SpaceTime *stime= (SpaceTime *)mm->slink;
 						if (stime->flag & TIME_DRAWFRAMES) 
 							BLI_snprintf(str, sizeof(str), "Marker %d offset %d", selmarker->frame, offs);
@@ -816,7 +816,7 @@
 				}
 				else {
 					/* we only print the offset */
-					if (ELEM(mm->slink->spacetype, SPACE_TIME, SPACE_SOUND)) { 
+					if (mm->slink->spacetype == SPACE_TIME) { 
 						SpaceTime *stime= (SpaceTime *)mm->slink;
 						if (stime->flag & TIME_DRAWFRAMES) 
 							BLI_snprintf(str, sizeof(str), "Marker offset %d ", offs);

Modified: trunk/blender/source/blender/editors/include/ED_space_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_space_api.h	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/include/ED_space_api.h	2011-11-01 19:48:45 UTC (rev 41448)
@@ -46,7 +46,6 @@
 void ED_spacetype_buttons(void);
 void ED_spacetype_info(void);
 void ED_spacetype_file(void);
-void ED_spacetype_sound(void);
 void ED_spacetype_action(void);
 void ED_spacetype_nla(void);
 void ED_spacetype_script(void);

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/interface/resources.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -135,9 +135,6 @@
 			case SPACE_OUTLINER:
 				ts= &btheme->toops;
 				break;
-			case SPACE_SOUND:
-				ts= &btheme->tsnd;
-				break;
 			case SPACE_INFO:
 				ts= &btheme->tinfo;
 				break;
@@ -525,7 +522,6 @@
 	ui_theme_init_new_do(&btheme->tfile);
 	ui_theme_init_new_do(&btheme->tipo);
 	ui_theme_init_new_do(&btheme->tinfo);
-	ui_theme_init_new_do(&btheme->tsnd);
 	ui_theme_init_new_do(&btheme->tact);
 	ui_theme_init_new_do(&btheme->tnla);
 	ui_theme_init_new_do(&btheme->tseq);
@@ -762,15 +758,11 @@
 	SETCOL(btheme->tconsole.console_error, 220, 96, 96, 255);
 	SETCOL(btheme->tconsole.console_cursor, 220, 96, 96, 255);
 	
-
-	/* space sound */
-	btheme->tsnd= btheme->tv3d;
-	SETCOLF(btheme->tsnd.back, 	0.45, 0.45, 0.45, 1.0);
-	SETCOLF(btheme->tsnd.grid, 	0.36, 0.36, 0.36, 1.0);
-	SETCOL(btheme->tsnd.shade1,  173, 173, 173, 255);		// sliders
-	
 	/* space time */
-	btheme->ttime= btheme->tsnd;	// same as sound space
+	btheme->ttime= btheme->tv3d;
+	SETCOLF(btheme->ttime.back, 	0.45, 0.45, 0.45, 1.0);
+	SETCOLF(btheme->ttime.grid, 	0.36, 0.36, 0.36, 1.0);
+	SETCOL(btheme->ttime.shade1,  173, 173, 173, 255);		// sliders
 	
 	/* space node, re-uses syntax color storage */
 	btheme->tnode= btheme->tv3d;
@@ -785,7 +777,6 @@
 	/* space logic */
 	btheme->tlogic= btheme->tv3d;
 	SETCOL(btheme->tlogic.back, 100, 100, 100, 255);
-	
 }
 
 
@@ -1177,7 +1168,11 @@
 		for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 			/* check for alpha==0 is safe, then color was never set */
 			if(btheme->ttime.back[3]==0) {
-				btheme->ttime = btheme->tsnd;	// copy from sound
+				// copied from ui_theme_init_default
+				btheme->ttime= btheme->tv3d;
+				SETCOLF(btheme->ttime.back, 	0.45, 0.45, 0.45, 1.0);
+				SETCOLF(btheme->ttime.grid, 	0.36, 0.36, 0.36, 1.0);
+				SETCOL(btheme->ttime.shade1,  173, 173, 173, 255);		// sliders
 			}
 			if(btheme->text.syntaxn[3]==0) {
 				SETCOL(btheme->text.syntaxn,	0, 0, 200, 255);	/* Numbers  Blue*/
@@ -1304,7 +1299,7 @@
 			SETCOL(btheme->tact.cframe, 0x60, 0xc0, 0x40, 255);
 			SETCOL(btheme->tnla.cframe, 0x60, 0xc0, 0x40, 255);
 			SETCOL(btheme->tseq.cframe, 0x60, 0xc0, 0x40, 255);
-			SETCOL(btheme->tsnd.cframe, 0x60, 0xc0, 0x40, 255);
+			//SETCOL(btheme->tsnd.cframe, 0x60, 0xc0, 0x40, 255); Not needed anymore
 			SETCOL(btheme->ttime.cframe, 0x60, 0xc0, 0x40, 255);
 		}
 	}

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -192,7 +192,7 @@
 {
 	if(ED_operator_areaactive(C)) {
 		SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C);
-		if (sl && (ELEM6(sl->spacetype, SPACE_SEQ, SPACE_SOUND, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME)))
+		if (sl && (ELEM5(sl->spacetype, SPACE_SEQ, SPACE_ACTION, SPACE_NLA, SPACE_IPO, SPACE_TIME)))
 			return TRUE;
 	}
 

Modified: trunk/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- trunk/blender/source/blender/editors/space_api/spacetypes.c	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/editors/space_api/spacetypes.c	2011-11-01 19:48:45 UTC (rev 41448)
@@ -81,7 +81,6 @@
 	ED_spacetype_buttons();
 	ED_spacetype_info();
 	ED_spacetype_file();
-	ED_spacetype_sound();
 	ED_spacetype_action();
 	ED_spacetype_nla();
 	ED_spacetype_script();

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-11-01 18:39:07 UTC (rev 41447)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-11-01 19:48:45 UTC (rev 41448)
@@ -483,22 +483,6 @@
 
 } SpaceUserPref;
 
-typedef struct SpaceSound {
-	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
-	int spacetype;
-	float blockscale;
-	struct ScrArea *area;
-	
-	View2D v2d;
-	
-	struct bSound *sound;
-	short mode, sndnr;
-	short xof, yof;
-	short flag, lock;
-	int pad2;
-} SpaceSound;
-
 /* view3d  Now in DNA_view3d_types.h */
 
 
@@ -886,7 +870,7 @@
 	SPACE_SEQ,
 	SPACE_TEXT,
 	SPACE_IMASEL, /* deprecated */
-	SPACE_SOUND,
+	SPACE_SOUND, /* Deprecated */
 	SPACE_ACTION,
 	SPACE_NLA,
 	SPACE_SCRIPT,


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list