[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11019] branches/soc-2007-hcube/source/ blender/src: Changing funcion references to new sound interface.
Csaba Hruska
csaba.hruska at gmail.com
Fri Jun 22 19:07:11 CEST 2007
Revision: 11019
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11019
Author: hcube
Date: 2007-06-22 19:07:11 +0200 (Fri, 22 Jun 2007)
Log Message:
-----------
Changing funcion references to new sound interface. RAM and HD audio names are joined to Audio.
Modified Paths:
--------------
branches/soc-2007-hcube/source/blender/src/buttons_scene.c
branches/soc-2007-hcube/source/blender/src/drawseq.c
branches/soc-2007-hcube/source/blender/src/drawsound.c
branches/soc-2007-hcube/source/blender/src/editscreen.c
branches/soc-2007-hcube/source/blender/src/editseq.c
branches/soc-2007-hcube/source/blender/src/header_sound.c
branches/soc-2007-hcube/source/blender/src/space.c
branches/soc-2007-hcube/source/blender/src/toets.c
branches/soc-2007-hcube/source/blender/src/usiblender.c
Modified: branches/soc-2007-hcube/source/blender/src/buttons_scene.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/buttons_scene.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/buttons_scene.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -53,7 +53,7 @@
#include "BKE_utildefines.h"
#include "BKE_sound.h"
-#include "BAU_sound.h"
+#include "BAU_soundsystem.h"
#include "BLI_blenlib.h"
@@ -123,9 +123,9 @@
/* ************************ SOUND *************************** */
// by hcube
+static void load_new_sample(char *str) /* called from fileselect */
+{
/*
-static void load_new_sample(char *str) // called from fileselect
-{
char name[FILE_MAX];
bSound *sound;
bSample *sample, *newsample;
@@ -160,9 +160,8 @@
BIF_undo_push("Load new audio file");
allqueue(REDRAWBUTSSCENE, 0);
-
+*/
}
-*/
void do_soundbuts(unsigned short event)
{
@@ -184,19 +183,18 @@
else strcpy(name, U.sounddir);
// by hcube
- //activate_fileselect(FILE_SPECIAL, "SELECT WAV FILE", name, load_new_sample);
+ activate_fileselect(FILE_SPECIAL, "SELECT AUDIO FILE", name, load_new_sample);
break;
case B_SOUND_PLAY_SAMPLE:
// by hcube
- /*
if (sound) {
if (sound->sample->type != SAMPLE_INVALID) {
- sound_play_sound(sound);
+ audio_sound_play(sound);
allqueue(REDRAWBUTSSCENE, 0);
}
}
- */
+
break;
case B_SOUND_MENU_SAMPLE:
@@ -206,6 +204,8 @@
BLI_strncpy(sound->name, sample->name, sizeof(sound->name));
// by hcube
//sound_set_sample(sound, sample);
+ audio_sample_load(sample);
+ sound->sample = sample;
do_soundbuts(B_SOUND_REDRAW);
}
}
@@ -213,7 +213,7 @@
break;
case B_SOUND_NAME_SAMPLE:
// by hcube
- //load_new_sample(sound->name);
+ load_new_sample(sound->name);
break;
case B_SOUND_UNPACK_SAMPLE:
@@ -240,16 +240,16 @@
case B_SOUND_COPY_SOUND:
// by hcube
- /*
+
if (sound) {
- tempsound = sound_make_copy(sound);
+ tempsound = audio_sound_clone(sound);
sound = tempsound;
id = &sound->id;
G.buts->lockpoin = (bSound*)id;
BIF_undo_push("Copy sound");
do_soundbuts(B_SOUND_REDRAW);
}
- */
+
break;
case B_SOUND_RECALC:
@@ -257,7 +257,7 @@
sound = G.main->sound.first;
while (sound) {
//free(sound->stream);
- sound->stream = 0;
+ //sound->stream = 0;
// by hcube
//audio_makestream(sound);
sound = (bSound *) sound->id.next;
@@ -295,7 +295,7 @@
if(uiNewPanel(curarea, block, "Listener", "Sound", 320, 0, 318, 204)==0) return;
// by hcube
- mixrate = 0;//sound_get_mixrate();
+ mixrate = audio_getmixrate();
sprintf(mixrateinfo, "Game Mixrate: %d Hz", mixrate);
uiDefBut(block, LABEL, 0, mixrateinfo, xco,yco,295,20, 0, 0, 0, 0, 0, "");
@@ -406,8 +406,8 @@
uiSetButLock(sound->id.lib!=0, ERROR_LIBDATA_MESSAGE);
// by hcube
- //sound_initialize_sample(sound);
- //sample = sound->sample;
+ audio_sample_load(sound->sample);
+ sample = sound->sample;
/* info string */
if (sound->sample && sound->sample->len) {
Modified: branches/soc-2007-hcube/source/blender/src/drawseq.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/drawseq.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/drawseq.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -102,8 +102,8 @@
else if(seq->type==SEQ_IMAGE) return "Image";
else if(seq->type==SEQ_SCENE) return "Scene";
else if(seq->type==SEQ_MOVIE) return "Movie";
- else if(seq->type==SEQ_RAM_SOUND) return "Audio (RAM)";
- else if(seq->type==SEQ_HD_SOUND) return "Audio (HD)";
+ else if(seq->type==SEQ_RAM_SOUND) return "Audio";
+ else if(seq->type==SEQ_HD_SOUND) return "Audio";
else if(seq->type<SEQ_EFFECT) return seq->strip->dir;
else if(seq->type==SEQ_CROSS) return "Cross";
else if(seq->type==SEQ_GAMCROSS) return "Gamma Cross";
@@ -302,7 +302,8 @@
// by hcube
//audio_makestream(seq->sound);
- if(seq->sound==NULL || seq->sound->stream==NULL) return;
+ //if(seq->sound==NULL || seq->sound->stream==NULL) return;
+ if(seq->sound==NULL) return;
if (seq->flag & SEQ_MUTE) glColor3ub(0x70, 0x80, 0x80); else glColor3ub(0x70, 0xc0, 0xc0);
@@ -338,7 +339,9 @@
offset_next = (int) (fsofs + ((f-x1)/sound_width) * feofs_sofs) & (~3);
if (f > G.v2d->cur.xmin) {
/* if this is close to the last sample just exit */
- if (offset_next >= sound->streamlen) break;
+ // by hcube
+ //if (offset_next >= sound->streamlen) break;
+ if (offset_next >= sound->sample->len) break;
wavesamplemin = 131070;
wavesamplemax = -131070;
Modified: branches/soc-2007-hcube/source/blender/src/drawsound.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/drawsound.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/drawsound.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -56,6 +56,7 @@
#include "BSE_drawipo.h"
#include "BSE_time.h"
#include "BMF_Api.h"
+#include "BAU_soundsystem.h"
/* local */
void drawsoundspace(ScrArea *sa, void *spacedata);
@@ -214,7 +215,7 @@
if (G.ssound->sound) {
// by hcube
- //sound_initialize_sample(G.ssound->sound);
+ audio_sample_load(G.ssound->sound->sample);
//draw_sample(G.ssound->sound->sample);
}
Modified: branches/soc-2007-hcube/source/blender/src/editscreen.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/editscreen.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/editscreen.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -105,6 +105,7 @@
#include "BSE_headerbuttons.h"
#include "BSE_view.h"
#include "BSE_seqaudio.h"
+#include "BAU_soundsystem.h"
#include "BPY_extern.h"
#include "mydevice.h"
@@ -1377,6 +1378,7 @@
BIF_read_file(ext_load_str);
// by hcube
//sound_initialize_sounds();
+ audio_sound_loadall();
}
else if ((event==ONLOAD_SCRIPT) && BPY_has_onload_script()) {
/* event queued in setup_app_data() in blender.c, where G.f is checked */
Modified: branches/soc-2007-hcube/source/blender/src/editseq.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/editseq.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/editseq.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -71,7 +71,7 @@
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_scene.h"
-#include "BAU_sound.h"
+#include "BAU_soundsystem.h"
#include "BIF_space.h"
#include "BIF_interface.h"
@@ -706,7 +706,7 @@
strncat(str, sfile->file, FILE_MAXFILE-1);
// by hcube
- sound= sound_new_sound(str);
+ sound= audio_sound_new(str);
if (!sound /*|| sound->sample->type == SAMPLE_INVALID*/) {
error("Unsupported audio format");
return 0;
@@ -721,7 +721,7 @@
//audio_makestream(sound);
//totframe= (int) ( ((float)(sound->streamlen-1)/( (float)G.scene->audio.mixrate*4.0 ))* (float)G.scene->r.frs_sec);
- totframe= sound->streamlen;
+ totframe = sound->sample->len;
/* make seq */
seq= alloc_sequence(((Editing *)G.scene->ed)->seqbasep, cfra, machine);
Modified: branches/soc-2007-hcube/source/blender/src/header_sound.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/header_sound.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/header_sound.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -65,7 +65,7 @@
#include "BIF_butspace.h"
#include "BKE_global.h"
-#include "BAU_sound.h"
+#include "BAU_soundsystem.h"
#include "BKE_main.h"
#include "BSE_drawipo.h"
@@ -94,7 +94,7 @@
if (G.ssound->sndnr == 32766) {
if (G.ssound && G.ssound->sound) strcpy(name, G.ssound->sound->name);
else strcpy(name, U.sounddir);
- activate_fileselect(FILE_SPECIAL, "SELECT WAV FILE", name,
+ activate_fileselect(FILE_SPECIAL, "SELECT AUDIO FILE", name,
load_space_sound);
} else {
nr= 1;
@@ -132,7 +132,7 @@
if (G.buts->texnr == 32766) {
if (id) strcpy(name, ((bSound *)id)->name);
else strcpy(name, U.sounddir);
- activate_fileselect(FILE_SPECIAL, "SELECT WAV FILE", name, load_sound_buttons);
+ activate_fileselect(FILE_SPECIAL, "SELECT AUDIO FILE", name, load_sound_buttons);
}
else {
nr= 1;
@@ -416,7 +416,7 @@
bSound *sound;
// by hcube
- sound= sound_new_sound(str);
+ sound = audio_sound_new(str);
if (sound) {
if (G.ssound) {
G.ssound->sound= sound;
@@ -434,7 +434,7 @@
bSound *sound;
// by hcube
- sound= sound_new_sound(str);
+ sound = audio_sound_new(str);
if (sound) {
if (curarea && curarea->spacetype==SPACE_BUTS) {
if (G.buts->mainb == CONTEXT_SCENE) {
Modified: branches/soc-2007-hcube/source/blender/src/space.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/space.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/space.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -165,6 +165,7 @@
#include "BKE_depsgraph.h"
#include "BSE_trans_types.h"
+#include "BAU_soundsystem.h"
#include "SYS_System.h" /* for the user def menu ... should move elsewhere. */
@@ -980,6 +981,7 @@
BKE_undo_step(1);
// by hcube
//sound_initialize_sounds();
+ audio_sound_loadall();
}
}
}
@@ -1002,6 +1004,7 @@
BKE_undo_step(-1);
// by hcube
//sound_initialize_sounds();
+ audio_sound_loadall();
}
}
}
Modified: branches/soc-2007-hcube/source/blender/src/toets.c
===================================================================
--- branches/soc-2007-hcube/source/blender/src/toets.c 2007-06-22 17:05:35 UTC (rev 11018)
+++ branches/soc-2007-hcube/source/blender/src/toets.c 2007-06-22 17:07:11 UTC (rev 11019)
@@ -96,6 +96,7 @@
#include "BSE_edit.h"
#include "BSE_editipo.h"
#include "BSE_headerbuttons.h"
+#include "BSE_seqaudio.h"
#include "blendef.h"
@@ -677,6 +678,7 @@
rem_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM);
// by hcube
//audiostream_stop();
+ seqaudio_stop();
allqueue(REDRAWALL, 0);
break;
Modified: branches/soc-2007-hcube/source/blender/src/usiblender.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list