Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-08 16:11:18 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'RDHPISoundSelector' widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-06 13:12:19 -05:00
parent 713306dcb0
commit dca515c135
5 changed files with 5 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21046,3 +21046,5 @@
* Removed the 'Q3Url' dependencies from rdrepld(8).
2021-02-06 Fred Gleason <fredg@paravelsystems.com>
* Removed dead code from rdcastmanager(1).
2021-02-06 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'RDHPISoundSelector' widget.

7
rdhpi/Makefile.am
View File

@ -53,14 +53,11 @@ lib_LTLIBRARIES = librdhpi.la
dist_librdhpi_la_SOURCES = rdhpiinformation.cpp rdhpiinformation.h\
rdhpiplaystream.cpp rdhpiplaystream.h\
rdhpirecordstream.cpp rdhpirecordstream.h\
rdhpisoundcard.cpp rdhpisoundcard.h\
rdhpisoundselector.cpp rdhpisoundselector.h
rdhpisoundcard.cpp rdhpisoundcard.h
nodist_librdhpi_la_SOURCES = moc_rdhpiplaystream.cpp\
moc_rdhpirecordstream.cpp\
moc_rdhpisoundcard.cpp\
moc_rdhpisoundselector.cpp
moc_rdhpisoundcard.cpp
librdhpi_la_LDFLAGS = -release $(VERSION)

4
rdhpi/rdhpi.pro
View File

@ -2,7 +2,7 @@
#
# The rdhpi/ QMake project file for Rivendell.
#
# (C) Copyright 2003-2007,2016 Fred Gleason <fredg@paravelsystems.com>
# (C) Copyright 2003-2021 Fred Gleason <fredg@paravelsystems.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
@ -28,13 +28,11 @@ SOURCES += rdhpiinformation.cpp
SOURCES += rdhpiplaystream.cpp
SOURCES += rdhpirecordstream.cpp
SOURCES += rdhpisoundcard.cpp
SOURCES += rdhpisoundselector.cpp
HEADERS += rdhpiinformation.h
HEADERS += rdhpiplaystream.h
HEADERS += rdhpirecordstream.h
HEADERS += rdhpisoundcard.h
HEADERS += rdhpisoundselector.h
TRANSLATIONS += rdhpi_cs.ts
TRANSLATIONS += rdhpi_de.ts

69
rdhpi/rdhpisoundselector.cpp
View File

@ -1,69 +0,0 @@
// rdhpisoundselector.cpp
//
// A selection widget for audio devices.
//
// (C) Copyright 2002-2007,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// 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; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
//
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <qobject.h>
#include <qwidget.h>
#include <qstring.h>
#include <qdatetime.h>
#include <rdhpisoundselector.h>
RDHPISoundSelector::RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class,
RDConfig *config,QWidget *parent)
:Q3ListBox(parent)
{
sound_card=new RDHPISoundCard(config,this);
if(dev_class==RDHPISoundCard::PlayDevice) {
for(int i=0;i<sound_card->getCardQuantity();i++) {
for(int j=0;j<sound_card->getCardOutputPorts(i);j++) {
insertItem(sound_card->getOutputPortDescription(i,j),
i*HPI_MAX_NODES+j);
}
}
}
if(dev_class==RDHPISoundCard::RecordDevice) {
for(int i=0;i<sound_card->getCardQuantity();i++) {
for(int j=0;j<sound_card->getCardInputPorts(i);j++) {
insertItem(sound_card->getInputPortDescription(i,j),
i*HPI_MAX_NODES+j);
}
}
}
connect(this,SIGNAL(highlighted(int)),this,SLOT(selection(int)));
}
void RDHPISoundSelector::selection(int selection)
{
emit changed(selection/HPI_MAX_ADAPTERS,
selection-HPI_MAX_ADAPTERS*(selection/HPI_MAX_ADAPTERS));
emit cardChanged(selection/HPI_MAX_ADAPTERS);
emit portChanged(selection-HPI_MAX_ADAPTERS*(selection/HPI_MAX_ADAPTERS));
}

65
rdhpi/rdhpisoundselector.h
View File

@ -1,65 +0,0 @@
// rdhpisoundselector.h
//
// A selection widget for audio devices.
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// 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; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDHPISOUNDSELECTOR_H
#define RDHPISOUNDSELECTOR_H
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <qobject.h>
#include <qwidget.h>
#include <qstring.h>
#include <qdatetime.h>
#include <qtimer.h>
#include <q3listbox.h>
#include "rdhpisoundcard.h"
#ifdef ALSA
#include <alsa/asoundlib.h>
#endif // HPI
#ifdef JACK
#include <jack/jack.h>
#endif // JACK
class RDHPISoundSelector : public Q3ListBox
{
Q_OBJECT
public:
RDHPISoundSelector(RDHPISoundCard::DeviceClass dev_class,RDConfig *config,
QWidget *parent=0);
signals:
void changed(int card,int port);
void cardChanged(int card);
void portChanged(int port);
private slots:
void selection(int selection);
private:
RDHPISoundCard *sound_card;
};
#endif // RDHPISOUNDSELECTOR_H