[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11752] branches/soc-2007-hcube/source/ blender/src/drawseq.c: disable sound sequence drawing.

[Csaba Hruska]

Revision: 11752
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11752
Author:   hcube
Date:     2007-08-20 21:27:56 +0200 (Mon, 20 Aug 2007)

Log Message:
-----------
disable sound sequence drawing.

Modified Paths:
--------------
    branches/soc-2007-hcube/source/blender/src/drawseq.c

Modified: branches/soc-2007-hcube/source/blender/src/drawseq.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/drawseq.c	2007-08-20 19:26:46 UTC (rev 11751)
+++ branches/soc-2007-hcube/source/blender/src/drawseq.c	2007-08-20 19:27:56 UTC (rev 11752)
@@ -78,6 +78,8 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
+#include "BAU_soundsystem.h"
+
 #include "blendef.h"	/* CFRA */
 #include "mydevice.h"	/* REDRAWSEQ */
 #include "interface.h"
@@ -296,15 +298,17 @@
 	however this is slow ehrn zoomed out so when the sample step is above
 	1 (the larger the further out the zoom is) so not evaluate all samples, only some. */
 	
-	signed short* s;
+	signed char* s;
 	bSound *sound;
-	unsigned char *stream;
+	signed char *stream;
 	
     // by hcube
-	if(seq->sound==NULL /*|| seq->sound->stream==NULL*/) return;
+	return;
+	if(seq->sound==NULL) return;
 	
 	if (seq->flag & SEQ_MUTE) glColor3ub(0x70, 0x80, 0x80); else glColor3ub(0x70, 0xc0, 0xc0);
 	
+	//audio_getmixrate() ???
 	sofs = ((int)( (((float)(seq->startdisp-seq->start))/(float)G.scene->r.frs_sec)*(float)G.scene->audio.mixrate*4.0 )) & (~3);
 	eofs = ((int)( (((float)(seq->enddisp-seq->start))/(float)G.scene->r.frs_sec)*(float)G.scene->audio.mixrate*4.0 )) & (~3);
 	
@@ -322,7 +326,10 @@
 	feofs_sofs= (float)(eofs-sofs);
 	sound_width= x2-x1;
 	sound = seq->sound;
-	stream = sound->stream;
+	
+	// currently the first channel
+	stream = audio_sample_getvisualpcmdata(sound->sample);
+	
 	wavemulti = (y2-y1)/196605; /*y2-y1 is the height*/
 	wavesample=0;