hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Alsa and OSS Device hints

Browse Source 
This should resolve the remaining issues.  OSS has auto-complete with
the filesystem.  Alsa has an editable combobox for PCM and MIDI-raw.
The DEVICE  box for Alsa MIDI-seq should be obsoleted
This commit is contained in:
Paul Giblock
2009-10-25 16:17:12 -04:00
parent 82fd694e4a
commit 3fe353545b
7 changed files with 199 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/AlsaDeviceListModel.h Normal file
View File

@@ -0,0 +1,62 @@
/*
* AlsaDeviceListModel - allows quick access to a list of alsa devices
*
* Copyright (c) 2009 Paul Giblock <pgib/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#ifndef _ALSA_DEVICE_LIST_MODEL
#define _ALSA_DEVICE_LIST_MODEL
#include "lmmsconfig.h"
#ifdef LMMS_HAVE_ALSA
#include <alsa/asoundlib.h>
#include "QAbstractListModel"
class AlsaDeviceListModel : public QAbstractListModel
{
public:
AlsaDeviceListModel(
snd_rawmidi_stream_t _stream, QObject * _parent );
AlsaDeviceListModel(
snd_pcm_stream_t _stream, QObject * _parent );
AlsaDeviceListModel( QObject * _parent );
protected:
void init( const char * _iface, const char * _filter );
int rowCount( const QModelIndex & parent = QModelIndex() ) const;
QVariant data( const QModelIndex & index,
int role = Qt::DisplayRole ) const;
private:
typedef QPair<QString,QString> StringPair;
typedef QList<StringPair> DeviceList;
DeviceList m_devices;
};
#endif // LMMS_HAVE_ALSA
#endif

18
include/AudioAlsa.h
View File

@@ -35,7 +35,6 @@
#include <alsa/asoundlib.h>
#include "AudioDevice.h"
#include "QAbstractListModel"
class lcdSpinBox;
@@ -57,23 +56,6 @@ public:
static QString probeDevice();
class DeviceListModel : public QAbstractListModel
{
public:
// iface = {"pcm", "rawmidi", "timer", "seq"}
// stream = {SND_PCM_STREAM_CAPTURE, SND_PCM_STREAM_PLAYBACK}
DeviceListModel( const char * _iface, snd_pcm_stream_t stream );
int rowCount( const QModelIndex & parent = QModelIndex() ) const;
QVariant data( const QModelIndex & index,
int role = Qt::DisplayRole ) const;
private:
typedef QPair<QString,QString> StringPair;
typedef QList<StringPair> DeviceList;
DeviceList m_devices;
};
class setupWidget : public AudioDevice::setupWidget
{
public:

4
include/MidiAlsaRaw.h
View File

@@ -37,7 +37,7 @@
struct pollfd;
class QLineEdit;
class QComboBox;
class MidiAlsaRaw : public MidiClientRaw , public QThread
@@ -65,7 +65,7 @@ public:
virtual void saveSettings();
private:
QLineEdit * m_device;
QComboBox * m_device;
} ;

120
src/core/audio/AlsaDeviceListModel.cpp Normal file
View File

@@ -0,0 +1,120 @@
/*
* AlsaDeviceListModel - allows quick access to a list of alsa devices
*
* Copyright (c) 2009 Paul Giblock <pgib/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#include <QtCore/QObject>
#include "AlsaDeviceListModel.h"
#ifdef LMMS_HAVE_ALSA
AlsaDeviceListModel::AlsaDeviceListModel(
snd_rawmidi_stream_t _stream,
QObject * _parent ) :
QAbstractListModel( _parent )
{
init( "rawmidi", SND_RAWMIDI_STREAM_INPUT ?
"Input" :
"Output" );
}
AlsaDeviceListModel::AlsaDeviceListModel(
snd_pcm_stream_t _stream,
QObject * _parent ) :
QAbstractListModel( _parent )
{
init( "pcm", SND_PCM_STREAM_CAPTURE ?
"Input" :
"Output" );
}
AlsaDeviceListModel::AlsaDeviceListModel(
QObject * _parent ) :
QAbstractListModel( _parent )
{
init( "seq", NULL);
}
void AlsaDeviceListModel::init(
const char * _iface,
const char * _filter)
{
void **hints, **n;
char *name, *descr, *io;
if (snd_device_name_hint(-1, _iface, &hints) < 0)
return;
n = hints;
while (*n != NULL) {
name = snd_device_name_get_hint(*n, "NAME");
descr = snd_device_name_get_hint(*n, "DESC");
io = snd_device_name_get_hint(*n, "IOID");
// Filter out non-null or filtered items
if (io == NULL || _filter == NULL || strcmp(io, _filter) == 0)
m_devices.append(StringPair(name, descr));
if (name != NULL)
free(name);
if (descr != NULL)
free(descr);
if (io != NULL)
free(io);
n++;
}
snd_device_name_free_hint(hints);
}
int AlsaDeviceListModel::rowCount(
const QModelIndex & parent ) const
{
return m_devices.count();
}
QVariant AlsaDeviceListModel::data(
const QModelIndex & index,
int role ) const
{
switch( role )
{
case Qt::DisplayRole:
return m_devices.at( index.row() ).first;
case Qt::ToolTipRole:
case Qt::StatusTipRole:
return m_devices.at( index.row() ).second;
default:
return QVariant();
};
}
#endif // LMMS_HAVE_ALSA

71
src/core/audio/AudioAlsa.cpp
View File

@@ -29,6 +29,7 @@
#ifdef LMMS_HAVE_ALSA
#include "AlsaDeviceListModel.h"
#include "endian_handling.h"
#include "config_mgr.h"
#include "engine.h"
@@ -491,84 +492,18 @@ int AudioAlsa::setSWParams()
AudioAlsa::DeviceListModel::DeviceListModel(
const char * _iface, snd_pcm_stream_t _stream )
{
void **hints, **n;
char *name, *descr, *io;
const char *filter;
if (snd_device_name_hint(-1, _iface, &hints) < 0)
return;
n = hints;
filter = _stream == SND_PCM_STREAM_CAPTURE ? "Input" : "Output";
while (*n != NULL) {
name = snd_device_name_get_hint(*n, "NAME");
descr = snd_device_name_get_hint(*n, "DESC");
io = snd_device_name_get_hint(*n, "IOID");
// Filter out non-null or filtered items
if (io != NULL && strcmp(io, filter) != 0)
continue;
m_devices.append(StringPair(name, descr));
if (name != NULL)
free(name);
if (descr != NULL)
free(descr);
if (io != NULL)
free(io);
n++;
}
snd_device_name_free_hint(hints);
}
int AudioAlsa::DeviceListModel::rowCount(
const QModelIndex & parent ) const
{
return m_devices.count();
}
QVariant AudioAlsa::DeviceListModel::data(
const QModelIndex & index,
int role ) const
{
switch( role )
{
case Qt::DisplayRole:
return m_devices.at(index.row()).first;
case Qt::ToolTipRole:
case Qt::StatusTipRole:
return m_devices.at(index.row()).second;
default:
return QVariant();
};
}
AudioAlsa::setupWidget::setupWidget( QWidget * _parent ) :
AudioDevice::setupWidget( AudioAlsa::name(), _parent )
{
m_device = new QComboBox( this );
m_device->setGeometry( 10, 20, 180, 20 );
m_device->setModel(
new DeviceListModel( "pcm", SND_PCM_STREAM_PLAYBACK ) );
m_device->setModel( new AlsaDeviceListModel(
SND_PCM_STREAM_PLAYBACK, this ) );
m_device->setEditable( true );
m_device->setInsertPolicy( QComboBox::NoInsert );
m_device->setEditText( AudioAlsa::probeDevice() );
// Why doesn't Qt already do this?
connect( m_device, SIGNAL(currentIndexChanged(const QString &)),
this, SLOT(poo(const QString &)) );
QLabel * dev_lbl = new QLabel( tr( "DEVICE" ), this );
dev_lbl->setFont( pointSize<6>( dev_lbl->font() ) );
dev_lbl->setGeometry( 10, 40, 180, 10 );

15
src/core/midi/MidiAlsaRaw.cpp
View File

@@ -23,8 +23,9 @@
*/
#include <QtGui/QLabel>
#include <QtGui/QLineEdit>
#include <QtGui/QComboBox>
#include "AlsaDeviceListModel.h"
#include "MidiAlsaRaw.h"
#include "config_mgr.h"
#include "gui_templates.h"
@@ -179,8 +180,14 @@ void MidiAlsaRaw::run()
MidiAlsaRaw::setupWidget::setupWidget( QWidget * _parent ) :
MidiClientRaw::setupWidget( MidiAlsaRaw::name(), _parent )
{
m_device = new QLineEdit( MidiAlsaRaw::probeDevice(), this );
m_device->setGeometry( 10, 20, 160, 20 );
m_device = new QComboBox( this );
m_device->setGeometry( 10, 20, 180, 20 );
m_device->setModel( new AlsaDeviceListModel(
SND_RAWMIDI_STREAM_INPUT,
this ) );
m_device->setEditable( true );
m_device->setInsertPolicy( QComboBox::NoInsert );
m_device->setEditText( MidiAlsaRaw::probeDevice() );
QLabel * dev_lbl = new QLabel( tr( "DEVICE" ), this );
dev_lbl->setFont( pointSize<6>( dev_lbl->font() ) );
@@ -200,7 +207,7 @@ MidiAlsaRaw::setupWidget::~setupWidget()
void MidiAlsaRaw::setupWidget::saveSettings()
{
configManager::inst()->setValue( "MidiAlsaRaw", "Device",
m_device->text() );
m_device->currentText() );
}

2
src/core/midi/MidiAlsaSeq.cpp
View File

@@ -669,7 +669,7 @@ MidiAlsaSeq::setupWidget::setupWidget( QWidget * _parent ) :
MidiClient::setupWidget( MidiAlsaSeq::name(), _parent )
{
m_device = new QLineEdit( MidiAlsaSeq::probeDevice(), this );
m_device->setGeometry( 10, 20, 160, 20 );
m_device->setGeometry( 10, 20, 180, 20 );
QLabel * dev_lbl = new QLabel( tr( "DEVICE" ), this );
dev_lbl->setFont( pointSize<6>( dev_lbl->font() ) );