← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Audio/DevSB16.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Audio/DevSB16.cpp
1
 
/* $Id: DevSB16.cpp $ */
 
1
/* $Id: DevSB16.cpp 35487 2011-01-11 13:45:20Z vboxsync $ */
2
2
/** @file
3
3
 * DevSB16 - VBox SB16 Audio Controller.
4
4
 *
32
32
 */
33
33
 
34
34
#define LOG_GROUP LOG_GROUP_DEV_AUDIO
35
 
#include <VBox/pdmdev.h>
 
35
#include <VBox/vmm/pdmdev.h>
36
36
#include <iprt/assert.h>
37
37
#include <iprt/string.h>
38
38
#include <iprt/uuid.h>
39
 
#include "../vl_vbox.h"
 
39
#include "vl_vbox.h"
40
40
 
41
41
extern "C" {
42
42
#include "audio.h"
1899
1899
    AUD_register_card("sb16", &s->card);
1900
1900
    legacy_reset(s);
1901
1901
 
1902
 
    if (!s->voice)
 
1902
    if (!AUD_is_host_voice_out_ok(s->voice))
1903
1903
    {
 
1904
        LogRel (("SB16: WARNING: Unable to open PCM OUT!\n"));
1904
1905
        AUD_close_out(&s->card, s->voice);
1905
1906
        s->voice = NULL;
1906
1907
        AUD_init_null();
1933
1934
    sizeof(SB16State),
1934
1935
    /* pfnConstruct */
1935
1936
    sb16Construct,
1936
 
    /* pfnDesctruct */
 
1937
    /* pfnDestruct */
1937
1938
    NULL,
1938
1939
    /* pfnRelocate */
1939
1940
    NULL,