Switch to unified view

a/sc2src/rcvqueue.h b/sc2src/rcvqueue.h
...
...
28
public:
28
public:
29
    // If buf is not 0, it is a malloced buffer, and we take
29
    // If buf is not 0, it is a malloced buffer, and we take
30
    // ownership. The caller MUST NOT free it. Its size must be at
30
    // ownership. The caller MUST NOT free it. Its size must be at
31
    // least (bits/8) * chans * samples
31
    // least (bits/8) * chans * samples
32
    AudioMessage(unsigned int bits, unsigned int channels, unsigned int frames,
32
    AudioMessage(unsigned int bits, unsigned int channels, unsigned int frames,
33
                 unsigned int sampfreq, char *buf, unsigned int allocbytes) 
33
                 unsigned int sampfreq, bool halt, char *buf,
34
                 unsigned int allocbytes)
34
        : m_bits(bits), m_chans(channels), m_freq(sampfreq),
35
        : m_bits(bits), m_chans(channels), m_freq(sampfreq), m_halt(halt),
35
          m_bytes(buf ? (bits/8) * channels * frames : 0),
36
          m_bytes(buf ? (bits/8) * channels * frames : 0),
36
          m_allocbytes(allocbytes), m_buf(buf), m_curoffs(0) {
37
          m_allocbytes(allocbytes), m_buf(buf), m_curoffs(0) {
37
    }
38
    }
38
39
39
    ~AudioMessage() {
40
    ~AudioMessage() {
...
...
52
    }
53
    }
53
54
54
    unsigned int m_bits;
55
    unsigned int m_bits;
55
    unsigned int m_chans;
56
    unsigned int m_chans;
56
    unsigned int m_freq;
57
    unsigned int m_freq;
58
    bool m_halt; // no more audio will follow
57
    unsigned int m_bytes; // Useful bytes
59
    unsigned int m_bytes; // Useful bytes
58
    unsigned int m_allocbytes; // buffer size
60
    unsigned int m_allocbytes; // buffer size
59
    char *m_buf;
61
    char *m_buf;
60
    unsigned int m_curoffs; /* Used by the http data emitter */
62
    unsigned int m_curoffs; /* Used by the http data emitter */
61
};
63
};