← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/src/drawsound.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2005-11-06 12:40:03 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051106124003-3pgs7tcg5rox96xg
Tags: 2.37a-1.1
http://bugs.debian.org/333958
* Non-maintainer upload.
* Split out parts of 01_SConstruct_debian.dpatch again: root_build_dir
  really needs to get adjusted before the clean target runs - closes: #333958,
  see #288882 for reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/drawsound.c
1
1
/**
2
 
 * $Id: drawsound.c,v 1.12 2003/11/19 22:00:12 ton Exp $
 
2
 * $Id: drawsound.c,v 1.15 2005/03/19 21:08:11 zuster Exp $
3
3
 *
4
4
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
5
5
 *
37
37
#include <config.h>
38
38
#endif
39
39
 
40
 
#ifdef WIN32
41
 
#include "BLI_winstuff.h"
42
 
#endif
43
 
 
44
40
#include "BLI_blenlib.h"
45
41
#include "BLI_arithb.h"
46
42
 
103
99
        short *sp, sampdx;
104
100
        
105
101
        /* one sample is where in v2d space? (v2d space in frames!) */
106
 
        sampfac= 25.0/(sample->rate);
 
102
        sampfac= ((float)G.scene->r.frs_sec)/(sample->rate);
107
103
 
108
104
        /* how many samples? */
109
105
        samples= sample->len/(sample->channels*(sample->bits/8));
200
196
        glClearColor(col[0], col[1], col[2], 0.0);
201
197
        glClear(GL_COLOR_BUFFER_BIT);
202
198
 
203
 
        calc_scrollrcts(G.v2d, curarea->winx, curarea->winy);
 
199
        calc_scrollrcts(sa, G.v2d, curarea->winx, curarea->winy);
204
200
 
205
201
        if(curarea->winx>SCROLLB+10 && curarea->winy>SCROLLH+10) {
206
202
                if(G.v2d->scroll) {