VirtualBox

Changeset 20501 in vbox for trunk/src


Ignore:
Timestamp:
Jun 12, 2009 11:31:37 AM (16 years ago)
Author:
vboxsync
Message:

Solaris/Audio: Boomer(OSS) support (disabled, requires snv_115+).

Location:
trunk/src/VBox
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/audio.c

    r20096 r20501  
    6363
    6464static struct audio_driver *drvtab[] = {
    65 #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
     65#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
    6666    &oss_audio_driver,
    6767#endif

  • trunk/src/VBox/Devices/Audio/ossaudio.c

    r3785 r20501  
    275275    }
    276276
     277/* Obsolete on Solaris (using O_NONBLOCK is sufficient) */
     278#if !(defined(VBOX) && defined(RT_OS_SOLARIS))
    277279    if (ioctl (fd, SNDCTL_DSP_NONBLOCK)) {
    278 #ifndef VBOX
     280# ifndef VBOX
    279281        oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n");
    280 #else
     282# else
    281283        LogRel(("OSS: Failed to set non-blocking mode (%s)\n", strerror(errno)));
    282 #endif
     284# endif
    283285        goto err;
    284286    }
     287#endif
    285288
    286289    mmmmssss = (req->nfrags << 16) | lsbindex (req->fragsize);

  • trunk/src/VBox/Devices/Makefile.kmk

    r20485 r20501  
    836836        Storage/DrvHostDVD.cpp \
    837837        Serial/DrvHostSerial.cpp
     838 ifdef VBOX_WITH_SOLARIS_OSS
     839  Drivers_SOURCES += Audio/ossaudio.c
     840  Drivers_DEFS += VBOX_WITH_SOLARIS_OSS
     841 endif
    838842 ifdef VBOX_WITH_CROSSBOW
    839843  Drivers_SOURCES += Network/solaris/vbox-libdlpi.cpp

  • trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

    r19817 r20501  
    19501950#elif defined(RT_OS_LINUX)
    19511951        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
     1952#elif defined(RT_OS_SOLARIS)
     1953# ifdef VBOX_WITH_SOLARIS_OSS
     1954        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
     1955# else
     1956        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "solaudio");              UPDATE_RC();
     1957# endif
    19521958#elif defined(RT_OS_L4)
    19531959        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();

  • trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

    r20318 r20501  
    3939        $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
    4040        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
     41        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
    4142        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
    4243        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

    r20313 r20501  
    199199        if (fSolaris)
    200200        {
    201             RTPrintf(                        "|solaudio");
     201            RTPrintf(                        "|solaudio"
     202#ifdef VBOX_WITH_SOLARIS_OSS
     203                                             "|oss"
     204#endif
     205                                              );
    202206        }
    203207        if (fLinux)

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r20474 r20501  
    14421442                }
    14431443
     1444# ifdef VBOX_WITH_SOLARIS_OSS
     1445                else if (!strcmp(audio, "oss"))
     1446                {
     1447                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
     1448                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
     1449                }
     1450# endif
     1451
    14441452#endif /* !RT_OS_SOLARIS */
    14451453#ifdef RT_OS_DARWIN

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r20243 r20501  
    177177        $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA) \
    178178        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
     179        $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS) \
    179180        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
    180181        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT)

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsAudio.cpp

    r19060 r20501  
    8484#if defined Q_OS_SOLARIS
    8585    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_SolAudio));
     86# if defined VBOX_WITH_SOLARIS_OSS
     87    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_OSS));
     88#endif
    8689#endif
    8790#if defined Q_OS_LINUX || defined Q_OS_FREEBSD

  • trunk/src/VBox/Main/AudioAdapterImpl.cpp

    r20262 r20501  
    259259# endif
    260260#endif /* RT_OS_LINUX */
    261 #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
     261#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
    262262            case AudioDriverType_OSS:
    263263#endif
    … …  
    431431# endif
    432432#endif // RT_OS_LINUX
    433 #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
     433#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
    434434    else if (strcmp (driver, "OSS") == 0)
    435435        mData->mAudioDriver = AudioDriverType_OSS;
    … …  
    530530# endif
    531531#endif /* RT_OS_LINUX */
    532 #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
     532#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
    533533            case AudioDriverType_OSS:
    534534            {

  • trunk/src/VBox/Main/ConsoleImpl2.cpp

    r20215 r20501  
    22792279# endif
    22802280#endif /* RT_OS_LINUX */
    2281 #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
     2281#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
    22822282            case AudioDriverType_OSS:
    22832283            {

  • trunk/src/VBox/Main/Makefile.kmk

    r20495 r20501  
    213213        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
    214214        $(if $(VBOX_WITH_WINMM),VBOX_WITH_WINMM,) \
     215        $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS,) \
    215216        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    216217        $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
    … …  
    546547        $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
    547548        $(if $(VBOX_WITH_WINMM),VBOX_WITH_WINMM,) \
     549        $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS,) \
    548550        $(if $(VBOX_WITH_CROSSBOW),VBOX_WITH_CROSSBOW,) \
    549551        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \

  • trunk/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd

    r18265 r20501  
    6363            <xsd:enumeration value="Null"/>
    6464            <xsd:enumeration value="SolAudio"/>
     65            <xsd:enumeration value="OSS"/>
    6566          </xsd:restriction>
    6667        </xsd:simpleType>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette