[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11610] branches/soc-2007-hcube/source/ blender/src: Enabled audio sync and scrubbing, using get/ set frame position functions.

[Csaba Hruska]

Revision: 11610
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11610
Author:   hcube
Date:     2007-08-15 10:27:32 +0200 (Wed, 15 Aug 2007)

Log Message:
-----------
Enabled audio sync and scrubbing, using get/set frame position functions.

Modified Paths:
--------------
    branches/soc-2007-hcube/source/blender/src/drawview.c
    branches/soc-2007-hcube/source/blender/src/editscreen.c
    branches/soc-2007-hcube/source/blender/src/headerbuttons.c

Modified: branches/soc-2007-hcube/source/blender/src/drawview.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/drawview.c	2007-08-15 08:26:16 UTC (rev 11609)
+++ branches/soc-2007-hcube/source/blender/src/drawview.c	2007-08-15 08:27:32 UTC (rev 11610)
@@ -3175,7 +3175,7 @@
 	double time;
 
     // by hcube
-	//if ((U.mixbufsize)/*&&(audiostream_pos() != CFRA)*/&&(G.scene->audio.flag & AUDIO_SYNC)) return 0;
+	if ((U.mixbufsize)&&(seqaudio_getframeposition() != CFRA)&&(G.scene->audio.flag & AUDIO_SYNC)) return 0;
 
 	time = PIL_check_seconds_timer();
 	
@@ -3242,9 +3242,8 @@
 	}
 	else {
         // by hcube
-		//if (U.mixbufsize && (G.scene->audio.flag & AUDIO_SYNC)) CFRA = audiostream_pos();
-		//else CFRA++;
-		CFRA++;
+		if (U.mixbufsize && (G.scene->audio.flag & AUDIO_SYNC)) CFRA = seqaudio_getframeposition();
+		else CFRA++;
 	}
 }
 

Modified: branches/soc-2007-hcube/source/blender/src/editscreen.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/editscreen.c	2007-08-15 08:26:16 UTC (rev 11609)
+++ branches/soc-2007-hcube/source/blender/src/editscreen.c	2007-08-15 08:27:32 UTC (rev 11610)
@@ -1089,7 +1089,7 @@
 		}
 		else {
             // by hcube
-			int cfra = 0;//audiostream_pos();
+			int cfra = seqaudio_getframeposition();//audiostream_pos();
 			if(cfra <= CFRA) CFRA++;
 			else CFRA= cfra;
 		}

Modified: branches/soc-2007-hcube/source/blender/src/headerbuttons.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/headerbuttons.c	2007-08-15 08:26:16 UTC (rev 11609)
+++ branches/soc-2007-hcube/source/blender/src/headerbuttons.c	2007-08-15 08:27:32 UTC (rev 11610)
@@ -417,8 +417,8 @@
 	scene_update_for_newframe(G.scene, screen_view3d_layers()); /* BKE_scene.h */
     
     // by hcube
-	//if ( (CFRA>1) && (!mute) && (G.scene->audio.flag & AUDIO_SCRUB)) 
-	//	audiostream_scrub( CFRA );
+	if ( (CFRA>1) && (!mute) && (G.scene->audio.flag & AUDIO_SCRUB)) 
+		seqaudio_setframeposition( CFRA );//	audiostream_scrub( CFRA );
 	
 	/* 3d window, preview */
 	BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT);