From 369eb054b0edf196641e8706f3f6fcd77788f690 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 21:55:51 +0000 Subject: Qt4 deprecation: Remove Qt4 and its consumes. 2019-03-15 accessibility/qt4-accessible: Qt4 has been EOL since december 2015 2019-03-15 astro/qlandkartegt: Qt4 has been EOL since december 2015 2019-03-15 astro/stellarium-qt4: Qt4 has been EOL since december 2015 2019-03-15 astro/xglobe: Qt4 has been EOL since december 2015 2019-03-15 audio/acoustid-fingerprinter: Qt4 has been EOL since december 2015 2019-03-15 audio/cueplayer: Qt4 has been EOL since december 2015 2019-03-15 audio/esperanza: Qt4 has been EOL since december 2015 2019-03-15 audio/lastfm-desktop: Qt4 has been EOL since december 2015 2019-03-15 audio/minitunes: Qt4 has been EOL since december 2015 2019-03-15 audio/mixxx20: Qt4 has been EOL since december 2015 2019-03-15 audio/mumble: Qt4 has been EOL since december 2015 2019-03-15 audio/murmur: Qt4 has been EOL since december 2015 2019-03-15 audio/puddletag: Qt4 has been EOL since december 2015 2019-03-15 audio/qmpdclient: Qt4 has been EOL since december 2015 2019-03-15 audio/skype-call-recorder: Qt4 has been EOL since december 2015 2019-03-15 audio/virtual_oss_ctl: Qt4 has been EOL since december 2015 2019-03-15 biology/clustalx: Qt4 has been EOL since december 2015 2019-03-15 cad/klayout: Qt4 has been EOL since december 2015 2019-03-15 cad/layouteditor: Qt4 has been EOL since december 2015 2019-03-15 cad/leocad: Qt4 has been EOL since december 2015 2019-03-15 cad/meshlab: Qt4 has been EOL since december 2015 2019-03-15 cad/qfsm: Qt4 has been EOL since december 2015 2019-03-15 cad/qucs: Qt4 has been EOL since december 2015 2019-03-15 chinese/gcin-qt4: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-cn: Qt4 has been EOL since december 2015 2019-03-15 chinese/qt4-codecs-tw: Qt4 has been EOL since december 2015 2019-03-15 chinese/qterm: Qt4 has been EOL since december 2015 2019-03-15 comms/dabstick-radio: Qt4 has been EOL since december 2015 2019-03-15 comms/hamfax: Qt4 has been EOL since december 2015 2019-03-15 comms/linpsk: Qt4 has been EOL since december 2015 2019-03-15 databases/py-qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-ibase-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-mysql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-odbc-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-pgsql-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sql: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/qt4-sqlite3-plugin: Qt4 has been EOL since december 2015 2019-03-15 databases/sqliteman: Qt4 has been EOL since december 2015 2019-03-15 databases/tora: Qt4 has been EOL since december 2015 2019-03-15 deskutils/cdcat: Qt4 has been EOL since december 2015 2019-03-15 deskutils/fbreader: Qt4 has been EOL since december 2015 2019-03-15 deskutils/launchy: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qorganizer: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qrfcview: Qt4 has been EOL since december 2015 2019-03-15 deskutils/qtm: Qt4 has been EOL since december 2015 2019-03-15 deskutils/tuxcards: Qt4 has been EOL since december 2015 2019-03-15 deskutils/vym: Qt4 has been EOL since december 2015 2019-03-15 devel/apiextractor: Qt4 has been EOL since december 2015 2019-03-15 devel/automoc4: Qt4 has been EOL since december 2015 2019-03-15 devel/edb: Qt4 has been EOL since december 2015 2019-03-15 devel/generatorrunner: Qt4 has been EOL since december 2015 2019-03-15 devel/grantlee: Qt4 has been EOL since december 2015 2019-03-15 devel/gwenhywfar-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/kaptain: Qt4 has been EOL since december 2015 2019-03-15 devel/ninja-ide: Qt4 has been EOL since december 2015 2019-03-12 devel/physfs-devel: is the same as devel/physfs, serving no purpose 2019-03-15 devel/piklab: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-core: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-dbussupport: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-help: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/py-qt4-test: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside: Qt4 has been EOL since december 2015 2019-03-15 devel/pyside-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qbzr: Qt4 has been EOL since december 2015 2019-03-15 devel/qct: Qt4 has been EOL since december 2015 2019-03-15 devel/qdevelop: Qt4 has been EOL since december 2015 2019-03-15 devel/qprog: Qt4 has been EOL since december 2015 2019-03-15 devel/qross: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2: Qt4 has been EOL since december 2015 2019-03-15 devel/qscintilla2-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-assistant-adp: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-corelib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-dbus: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-designer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-help-tools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-libqtassistantclient: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguist: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-linguisttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-makeqpf: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-moc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-porting: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdbusviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qdoc3: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmake: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qmlviewer: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qt3support: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-singleapplication: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qtsolutions-soap: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-qvfb: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-rcc: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-script: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-scripttools: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-testlib: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic: Qt4 has been EOL since december 2015 2019-03-15 devel/qt4-uic3: Qt4 has been EOL since december 2015 2019-03-15 devel/qtscriptgenerator: Qt4 has been EOL since december 2015 2019-03-15 devel/shiboken: Qt4 has been EOL since december 2015 2019-03-15 devel/subcommander2: Qt4 has been EOL since december 2015 2019-03-15 devel/universalindentgui: Qt4 has been EOL since december 2015 2019-03-15 editors/leo: Qt4 has been EOL since december 2015 2019-03-15 editors/lfhex: Qt4 has been EOL since december 2015 2019-03-15 editors/plume-creator-devel: Qt4 has been EOL since december 2015 2019-03-15 editors/textroom: Qt4 has been EOL since december 2015 2019-03-15 editors/yzis: Qt4 has been EOL since december 2015 2019-03-15 emulators/dboxfe: Qt4 has been EOL since december 2015 2019-03-15 emulators/q4wine: Qt4 has been EOL since december 2015 2019-03-15 emulators/qtemu: Qt4 has been EOL since december 2015 2019-03-15 emulators/swine: Qt4 has been EOL since december 2015 2019-03-15 finance/alkimia-qt4: Qt4 has been EOL since december 2015 2019-03-15 finance/bitcoin-armory: Qt4 has been EOL since december 2015 2019-03-15 finance/qhacc: Qt4 has been EOL since december 2015 2019-03-15 ftp/scythia: Qt4 has been EOL since december 2015 2019-03-15 games/bubble-chains: Qt4 has been EOL since december 2015 2019-03-15 games/capicity: Qt4 has been EOL since december 2015 2019-03-15 games/capitalism: Qt4 has been EOL since december 2015 2019-03-15 games/flukz: Qt4 has been EOL since december 2015 2019-03-15 games/goldencheetah: Qt4 has been EOL since december 2015 2019-03-15 games/jag: Qt4 has been EOL since december 2015 2019-03-15 games/kardsgt: Qt4 has been EOL since december 2015 2019-03-15 games/kcheckers: Qt4 has been EOL since december 2015 2019-03-15 games/openpref: Qt4 has been EOL since december 2015 2019-03-15 games/pokerth: Qt4 has been EOL since december 2015 2019-03-15 games/qgo: Qt4 has been EOL since december 2015 2019-03-15 games/qtads: Qt4 has been EOL since december 2015 2019-03-15 games/quackle: Qt4 has been EOL since december 2015 2019-03-15 games/spellathon: Qt4 has been EOL since december 2015 2019-03-15 games/sudoku-sensei: Qt4 has been EOL since december 2015 2019-03-15 games/tbe: Qt4 has been EOL since december 2015 2019-03-15 games/xptools: Qt4 has been EOL since december 2015 2019-03-15 german/tipp10: Qt4 has been EOL since december 2015 2019-03-15 graphics/appleseed: Qt4 has been EOL since december 2015 2019-03-15 graphics/aqsis: Qt4 has been EOL since december 2015 2019-03-15 graphics/autoq3d: Qt4 has been EOL since december 2015 2019-03-15 graphics/burplex: Qt4 has been EOL since december 2015 2019-03-15 graphics/darknock: Qt4 has been EOL since december 2015 2019-03-15 graphics/djview4-qt4: Qt4 has been EOL since december 2015 2019-03-15 graphics/easypaint: Qt4 has been EOL since december 2015 2019-03-15 graphics/eos-movrec: Qt4 has been EOL since december 2015 2019-03-15 graphics/gle-graphics: Qt4 has been EOL since december 2015 2019-03-15 graphics/lprof-devel: Qt4 has been EOL since december 2015 2019-03-15 graphics/luminance: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender: Qt4 has been EOL since december 2015 2019-03-15 graphics/luxrender14: Qt4 has been EOL since december 2015 2019-03-15 graphics/meshviewer: Qt4 has been EOL since december 2015 2019-03-15 graphics/natron: Qt4 has been EOL since december 2015 2019-03-15 graphics/oyranos: Qt4 has been EOL since december 2015 2019-03-15 graphics/pencil: Qt4 has been EOL since december 2015 2019-03-15 graphics/prison: Qt4 has been EOL since december 2015 2019-03-15 graphics/py-qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-iconengines: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-imageformats: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-pixeltool: Qt4 has been EOL since december 2015 2019-03-15 graphics/qt4-svg: Qt4 has been EOL since december 2015 2019-03-15 graphics/qxv: Qt4 has been EOL since december 2015, qxv is unmaintained 2019-03-15 graphics/scantailor: Qt4 has been EOL since december 2015 2019-03-15 graphics/seexpr: Qt4 has been EOL since december 2015 2019-03-15 graphics/smillaenlarger: Qt4 has been EOL since december 2015 2019-03-15 graphics/structuresynth: Qt4 has been EOL since december 2015 2019-03-15 graphics/yagf: Qt4 has been EOL since december 2015 2019-03-15 japanese/qt4-codecs-jp: Qt4 has been EOL since december 2015 2019-03-15 korean/qt4-codecs-kr: Qt4 has been EOL since december 2015 2019-03-15 mail/qgmailnotifier: Qt4 has been EOL since december 2015 2019-03-15 math/qtiplot: Qt4 has been EOL since december 2015 2019-03-15 math/qtoctave: Qt4 has been EOL since december 2015 2019-03-15 math/qwtplot3d-qt4: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-demo: Qt4 has been EOL since december 2015 2019-03-15 misc/py-qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qmetro: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-doc: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-l10n: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtconfig: Qt4 has been EOL since december 2015 2019-03-15 misc/qt4-qtdemo: Qt4 has been EOL since december 2015 2019-03-15 misc/saaghar: Qt4 has been EOL since december 2015 2019-03-15 multimedia/2mandvd: Qt4 has been EOL since december 2015 2019-03-15 multimedia/abby: Qt4 has been EOL since december 2015 2019-03-15 multimedia/avidemux-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/gstreamer-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mediadownloader: Qt4 has been EOL since december 2015 2019-03-15 multimedia/mlt-qt4: Qt4 has been EOL since december 2015 2019-03-15 multimedia/phonon-xine: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/py-qt4-phonon: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qmmp-plugin-pack: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-mobility: Qt4 has been EOL since december 2015 2019-03-15 multimedia/qt4-multimedia: Qt4 has been EOL since december 2015 2019-03-15 multimedia/umplayer: Qt4 has been EOL since december 2015 2019-03-15 net/avahi-qt4: Qt4 has been EOL since december 2015 2019-03-15 net/cagibi: Qt4 has been EOL since december 2015 2019-03-15 net/hupnp: Qt4 has been EOL since december 2015 2019-03-15 net/ostinato: Qt4 has been EOL since december 2015 2019-03-15 net/py-qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qjsonrpc: Qt4 has been EOL since december 2015 2019-03-15 net/qoauth: Qt4 has been EOL since december 2015 2019-03-15 net/qt4-network: Qt4 has been EOL since december 2015 2019-03-15 net/qtweetlib: Qt4 has been EOL since december 2015 2019-03-15 net-im/libjreen: Qt4 has been EOL since december 2015 2019-03-15 net-im/psimedia: Qt4 has been EOL since december 2015 2019-03-15 net-im/ramblercontacts: Qt4 has been EOL since december 2015 2019-03-15 net-im/telepathy-logger-qt4: Qt4 has been EOL since december 2015 2019-03-15 net-im/turpial: Qt4 has been EOL since december 2015 2019-03-15 net-im/vacuum-im: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/nagiosagent: Qt4 has been EOL since december 2015 2019-03-15 net-mgmt/qkismet: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/bitmessage: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/eiskaltdcpp-qt: Qt4 has been EOL since december 2015 2019-03-15 net-p2p/valknut: Qt4 has been EOL since december 2015 2019-03-15 polish/qfaktury: Qt4 has been EOL since december 2015 2019-03-15 print/kpdftool: Qt4 has been EOL since december 2015 2019-03-15 print/scribus: Qt4 has been EOL since december 2015 2019-03-15 science/MOOSE-neural-simulator: Qt4 has been EOL since december 2015 2019-03-15 science/avogadro: Qt4 has been EOL since december 2015 2019-03-15 science/openstructure: Qt4 has been EOL since december 2015 2019-03-15 science/py-veusz: Qt4 has been EOL since december 2015 2019-03-15 science/qtresistors: Qt4 has been EOL since december 2015 2019-03-15 security/keepassx2: Qt4 has been EOL since december 2015 2019-03-15 security/kqoauth: Qt4 has been EOL since december 2015 2019-03-15 security/tpmmanager: Qt4 has been EOL since december 2015 2019-03-15 sysutils/android-file-transfer-qt4: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bacula9-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-bat: Qt4 has been EOL since december 2015 2019-03-15 sysutils/bareos16-traymonitor: Qt4 has been EOL since december 2015 2019-03-15 sysutils/policykit-qt: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qpxtool: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qsynergy: Qt4 has been EOL since december 2015 2019-03-15 sysutils/qzeitgeist: Qt4 has been EOL since december 2015 2019-03-15 sysutils/searchmonkey: Qt4 has been EOL since december 2015 2019-03-15 sysutils/unetbootin: Qt4 has been EOL since december 2015 2019-03-15 textproc/beediff: Qt4 has been EOL since december 2015 2019-03-15 textproc/dixit: Qt4 has been EOL since december 2015 2019-03-15 textproc/goldendict: Qt4 has been EOL since december 2015 2019-03-15 textproc/ibus-qt: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/py-qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-clucene: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xml: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns: Qt4 has been EOL since december 2015 2019-03-15 textproc/qt4-xmlpatterns-tool: Qt4 has been EOL since december 2015 2019-03-15 textproc/scim-bridge-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/uim-qt4: Qt4 has been EOL since december 2015 2019-03-15 textproc/xxdiff: Qt4 has been EOL since december 2015 2019-03-15 www/aria2fe: Qt4 has been EOL since december 2015 2019-03-15 www/cutycapt: Qt4 has been EOL since december 2015 2019-03-15 www/py-qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qt4-webkit: Qt4 has been EOL since december 2015 2019-03-15 www/qupzilla-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11/leechcraft: Qt4 has been EOL since december 2015 2019-03-15 x11/py-qt4-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qimageblitz: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-graphicssystems-opengl: Qt4 has been EOL since december 2015 2019-03-15 x11/qt4-inputmethods: Qt4 has been EOL since december 2015 2019-03-15 x11/qxkb: Qt4 has been EOL since december 2015 2019-03-15 x11-fonts/fontmatrix: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-float: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-phase: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qt4-style-quantumstyle: Qt4 has been EOL since december 2015 2019-03-15 x11-themes/qtcurve-qt4: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/attica: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/py-qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-declarative: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4-gui: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qt4pas: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/qwt5-designerplugin: Qt4 has been EOL since december 2015 2019-03-15 x11-toolkits/soqt: Qt4 has been EOL since december 2015 2019-03-15 x11-wm/qlwm: Qt4 has been EOL since december 2015 Approved by: portmgr (implicit) --- audio/mumble/files/patch-src__mumble__OSS.cpp | 65 --------------------------- 1 file changed, 65 deletions(-) delete mode 100644 audio/mumble/files/patch-src__mumble__OSS.cpp (limited to 'audio/mumble/files/patch-src__mumble__OSS.cpp') diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp deleted file mode 100644 index 10ee5d91d003..000000000000 --- a/audio/mumble/files/patch-src__mumble__OSS.cpp +++ /dev/null @@ -1,65 +0,0 @@ ---- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC -+++ src/mumble/OSS.cpp -@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() { - qhOutput.insert(QString(), QLatin1String("Default OSS Device")); - qhDevices.insert(QString(), QLatin1String("/dev/dsp")); - --#if (SOUND_VERSION >= 0x040002) - int mixerfd = open("/dev/mixer", O_RDWR, 0); - if (mixerfd == -1) { - qWarning("OSSEnumerator: Failed to open /dev/mixer"); -@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() { - if (ainfo.caps & PCM_CAP_HIDDEN) - continue; - -- qhDevices.insert(handle, device); -+ qhDevices.insert(name, device); - - if (ainfo.caps & PCM_CAP_INPUT) -- qhInput.insert(handle, name); -+ qhInput.insert(name, name); - if (ainfo.caps & PCM_CAP_OUTPUT) -- qhOutput.insert(handle, name); -+ qhOutput.insert(name, name); - } - close(mixerfd); --#endif - } - - OSSInput::OSSInput() { -@@ -221,20 +219,23 @@ void OSSInput::run() { - ival = AFMT_S16_NE; - if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) { - qWarning("OSSInput: Failed to set sound format"); -- goto out; -+ close(fd); -+ return; - } - - ival = 1; - if ((ioctl(fd, SNDCTL_DSP_CHANNELS, &ival) == -1)) { - qWarning("OSSInput: Failed to set mono mode"); -- goto out; -+ close(fd); -+ return; - } - iMicChannels = ival; - - ival = SAMPLE_RATE; - if (ioctl(fd, SNDCTL_DSP_SPEED, &ival) == -1) { - qWarning("OSSInput: Failed to set speed"); -- goto out; -+ close(fd); -+ return; - } - iMicFreq = ival; - -@@ -258,8 +259,6 @@ void OSSInput::run() { - qWarning("OSSInput: Releasing."); - ioctl(fd, SNDCTL_DSP_RESET, NULL); - --out: -- close(fd); - } - - OSSOutput::OSSOutput() { -- cgit v1.2.3