← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Audio/audio.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Audio/audio.c
142
142
        }
143
143
    },
144
144
 
145
 
    { 100 },                    /* period */
 
145
    { 200 },                    /* frequency (in Hz) */
146
146
    0,                          /* plive */
147
147
};
148
148
 
1525
1525
     "Number of voices for ADC", NULL, 0},
1526
1526
 
1527
1527
    /* Misc */
1528
 
    {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hz,
1529
 
     "Timer period in HZ (0 - use lowest possible)", NULL, 0},
 
1528
    {"TIMER_FREQ", AUD_OPT_INT, &conf.period.hz,
 
1529
     "Timer frequency in Hz (0 - use lowest possible)", NULL, 0},
1530
1530
 
1531
1531
    {"PLIVE", AUD_OPT_BOOL, &conf.plive,
1532
1532
     "(undocumented)", NULL, 0},