archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- Fixed two swapped array indices in seqaudio.c which prevented panning

Browse Source 
from working correctly

- Added MKEY for muting audio strips (as they can't be part of a meta strip
  anyway)
This commit is contained in:
Alexander Ewering
2003-07-13 21:43:15 +00:00
parent 6914b1a197
commit 63323fd0e2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/seqaudio.c
View File

@@ -203,12 +203,8 @@ void audio_levels(Uint8 *buf, int len, float db, float facf, float pan)
for (i=0; i<len; i+=4) {
sample = (signed short*)(buf+i);
sample[1] = (short) ((float)sample[0] * facl);
sample[0] = (short) ((float)sample[1] * facr);
/* if (G.order==B_ENDIAN) {
sample[0] = ((((sample[0]) & 0xff00) >> 8) | ((sample[0]) & 0x00ff) << 8);
sample[1] = ((((sample[1]) & 0xff00) >> 8) | ((sample[1]) & 0x00ff) << 8);
}*/
sample[0] = (short) ((float)sample[0] * facl);
sample[1] = (short) ((float)sample[1] * facr);
}
}

9
source/blender/src/space.c
View File

@@ -2248,7 +2248,14 @@ void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
break;
case MKEY:
if(G.qual & LR_ALTKEY) un_meta();
else make_meta();
else {
if ((last_seq) && (last_seq->type == SEQ_SOUND))
{
last_seq->flag ^= SEQ_MUTE;
doredraw = 1;
}
else make_meta();
}
break;
case SKEY:
if(G.qual & LR_SHIFTKEY) seq_snapmenu();