← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/bluez/oneiric-proposed

« back to all changes in this revision

Viewing changes to sbc/sbcinfo.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-06-06 18:11:44 UTC
  • mfrom: (1.1.33 upstream) (6.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110606181144-28qwmmobedosb2ct
Tags: 4.94-0ubuntu1
* Resynchronize on Debian, remaining diff:
* debian/bluez.bluetooth.default:
  - Drop.  Doesn't do anything now.
* debian/control:
  - use arch: any rather than a list of architectures
* debian/bluez.bluetooth.init:
  - Drop most calls in this script as now all it serves as is to 
    workaround a problem with dbus not being ready early enough. Once dbus is 
    started by an upstart service, this should be able to be converted 
    to an upstart service too.
* debian/rules:
  - Don't build hid2hci anymore.  It's part of udev now.
  - Don't install bluez_agent.udev, doesn't work in Ubuntu.
  - Don't use simple-patchsys
* debian/source_bluez.py, debian/bluez.install:
  - apport hook made by Baptiste Mille-Mathias.      
* debian/source/format: 
  - use source format 3.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sbc/sbcinfo.c
174
174
        unsigned char buf[64];
175
175
        double rate;
176
176
        int bitpool[SIZE], frame_len[SIZE];
177
 
        int subbands, blocks, freq, mode, method;
 
177
        int subbands, blocks, freq, method;
178
178
        int n, p1, p2, fd, size, num;
179
179
        ssize_t len;
180
180
        unsigned int count;
199
199
        subbands = (hdr.subbands + 1) * 4;
200
200
        blocks = (hdr.blocks + 1) * 4;
201
201
        freq = hdr.sampling_frequency;
202
 
        mode = hdr.channel_mode;
203
202
        method = hdr.allocation_method;
204
203
 
205
204
        count = calc_frame_len(&hdr);