diff options
| -rw-r--r-- | source/blender/src/seqaudio.c | 8 | ||||
| -rw-r--r-- | source/blender/src/space.c | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c index fa43d3a6c39..fd52c779aea 100644 --- a/source/blender/src/seqaudio.c +++ b/source/blender/src/seqaudio.c @@ -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); } } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 6425303a97a..3f37b3c0ea5 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -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(); |