← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox-ose/oneiric

« back to all changes in this revision

Viewing changes to src/VBox/Main/include/AudioAdapterImpl.h

  • 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/Main/include/AudioAdapterImpl.h
1
 
/* $Id: AudioAdapterImpl.h $ */
 
1
/* $Id: AudioAdapterImpl.h 30764 2010-07-09 14:12:12Z vboxsync $ */
2
2
 
3
3
/** @file
4
4
 *
29
29
 
30
30
class ATL_NO_VTABLE AudioAdapter :
31
31
    public VirtualBoxBase,
32
 
    public VirtualBoxSupportErrorInfoImpl<AudioAdapter, IAudioAdapter>,
33
 
    public VirtualBoxSupportTranslation<AudioAdapter>,
34
32
    VBOX_SCRIPTABLE_IMPL(IAudioAdapter)
35
33
{
36
34
public:
44
42
        AudioControllerType_T mAudioController;
45
43
    };
46
44
 
47
 
    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (AudioAdapter)
 
45
    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(AudioAdapter, IAudioAdapter)
48
46
 
49
47
    DECLARE_NOT_AGGREGATABLE(AudioAdapter)
50
48
 
83
81
    void commit();
84
82
    void copyFrom(AudioAdapter *aThat);
85
83
 
86
 
    // for VirtualBoxSupportErrorInfoImpl
87
 
    static const wchar_t *getComponentName() { return L"AudioAdapter"; }
88
 
 
89
84
private:
90
85
 
91
86
    Machine * const     mParent;