← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/murmur/Server.h

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2010-01-09 19:28:50 UTC
  • mfrom: (9.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob
Tags: 1.2.1-2
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/murmur/Server.h
1
 
/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
 
1
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
2
2
   Copyright (C) 2009, Stefan Hacker <dd0t@users.sourceforge.net>
3
3
 
4
4
   All rights reserved.
60
60
        int iRecNum;
61
61
        int iSum;
62
62
        Timer qtFirst;
63
 
        unsigned char a_iBW[N_BANDWIDTH_SLOTS];
 
63
        unsigned short a_iBW[N_BANDWIDTH_SLOTS];
64
64
        Timer a_qtWhen[N_BANDWIDTH_SLOTS];
65
65
 
66
66
        BandwidthRecord();
67
 
        void addFrame(int size);
68
 
        int bytesPerSec() const;
 
67
        bool addFrame(int size, int maxpersec);
69
68
        int onlineSeconds() const;
70
69
        int idleSeconds() const;
71
70
        int bandwidth() const;
189
188
                int iTimeout;
190
189
                int iMaxBandwidth;
191
190
                int iMaxUsers;
 
191
                int iMaxUsersPerChannel;
192
192
                int iDefaultChan;
193
193
                int iMaxTextMessageLength;
194
194
                bool bAllowHTML;