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

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

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/rdalsaconfig/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2009-2020 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2009-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
@@ -18,7 +18,7 @@
## Use automake to process this into a Makefile.in
##
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
@@ -36,7 +36,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\
nodist_rdalsaconfig_SOURCES = moc_rdalsamodel.cpp\
moc_rdalsaconfig.cpp
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
EXTRA_DIST = rdalsaconfig.pro

4
utils/rdalsaconfig/rdalsaconfig.cpp
View File

@@ -90,8 +90,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
alsa_system_list=new QListView(this);
alsa_system_list->setSelectionMode(QAbstractItemView::MultiSelection);
alsa_system_label=
new QLabel(alsa_system_list,tr("ALSA Sound Devices"),this);
alsa_system_label=new QLabel(tr("ALSA Sound Devices"),this);
alsa_system_label->setFont(labelFont());
alsa_system_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
alsa_description_label=new QLabel(this);
@@ -432,7 +431,6 @@ int main(int argc,char *argv[])
RDConfig *config=new RDConfig();
config->load();
MainWidget *w=new MainWidget(config);
a.setMainWidget(w);
w->setGeometry(QRect(QPoint(0,0),w->sizeHint()));
w->show();
return a.exec();

12
utils/rdalsaconfig/rdalsamodel.cpp
View File

@@ -2,7 +2,7 @@
//
// Abstract an ALSA configuration.
//
// (C) Copyright 2009-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2009-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
@@ -18,12 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <stdio.h>
#include <alsa/asoundlib.h>
#include <qstringlist.h>
#include <rdapplication.h>
#include <rdalsamodel.h>
@@ -277,7 +271,7 @@ bool RDAlsaModel::saveConfig(const QString &filename)
return false;
}
for(int i=0;i<model_other_lines.size();i++) {
fprintf(f,model_other_lines.at(i));
fprintf(f,"%s\n",model_other_lines.at(i).toUtf8().constData());
}
fprintf(f,"%s\n",START_MARKER);
for(int i=0;i<model_alsa_cards.size();i++) {
@@ -315,7 +309,7 @@ void RDAlsaModel::LoadSystemConfig()
snd_ctl_t *snd_ctl=NULL;
int index=0;
while(snd_ctl_open(&snd_ctl,QString().sprintf("hw:%d",index),0)>=0) {
while(snd_ctl_open(&snd_ctl,QString().sprintf("hw:%d",index).toUtf8(),0)>=0) {
model_alsa_cards.push_back(new RDAlsaCard(snd_ctl,index));
for(int i=0;i<model_alsa_cards.back()->pcmQuantity();i++) {
model_card_index.push_back(index);