Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2018-08-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/rdalsaconfig/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for utils/rdalsaconfig
##
## (C) Copyright 2009,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2009,2016-2018 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
@@ -20,8 +18,8 @@
## Use automake to process this into a Makefile.in
##
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
@@ -36,7 +34,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\
nodist_rdalsaconfig_SOURCES = moc_rdalsaconfig.cpp
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@
rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdalsaconfig.pro

6
utils/rdalsaconfig/alsaitem.cpp
View File

@@ -20,14 +20,14 @@
#include <alsaitem.h>
AlsaItem::AlsaItem(QListBox *listbox,const QString &text)
: QListBoxText(listbox,text)
AlsaItem::AlsaItem(Q3ListBox *listbox,const QString &text)
: Q3ListBoxText(listbox,text)
{
}
AlsaItem::AlsaItem(const QString &text)
: QListBoxText(text)
: Q3ListBoxText(text)
{
alsa_card=-1;
alsa_device=-1;

6
utils/rdalsaconfig/alsaitem.h
View File

@@ -22,12 +22,12 @@
#ifndef ALSAITEM_H
#define ALSAITEM_H
#include <qlistbox.h>
#include <q3listbox.h>
class AlsaItem : public QListBoxText
class AlsaItem : public Q3ListBoxText
{
public:
AlsaItem(QListBox *listbox,const QString &text=QString::null);
AlsaItem(Q3ListBox *listbox,const QString &text=QString::null);
AlsaItem(const QString &text=QString::null);
AlsaItem(const AlsaItem &item);
int card() const;

2
utils/rdalsaconfig/rdalsa.cpp
View File

@@ -271,7 +271,7 @@ bool RDAlsa::SaveAsoundConfig(const QString &filename)
if((f=fopen(filename,"w"))==NULL) {
return false;
}
for(unsigned i=0;i<card_other_lines.size();i++) {
for(int i=0;i<card_other_lines.size();i++) {
fprintf(f,card_other_lines[i]);
}

16
utils/rdalsaconfig/rdalsaconfig.cpp
View File

@@ -25,6 +25,10 @@
#include <qapplication.h>
#include <qwindowsstyle.h>
#include <qmessagebox.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QResizeEvent>
#include <QLabel>
#include <rdcmd_switch.h>
@@ -80,12 +84,12 @@ MainWidget::MainWidget(QWidget *parent)
//
// Available Devices
//
alsa_system_list=new QListBox(this);
alsa_system_list=new Q3ListBox(this);
alsa_system_list->setFont(font);
alsa_system_label=
new QLabel(alsa_system_list,tr("Available Sound Devices"),this);
alsa_system_label->setFont(label_font);
alsa_system_label->setAlignment(AlignLeft|AlignVCenter);
alsa_system_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Up Button
@@ -103,11 +107,11 @@ MainWidget::MainWidget(QWidget *parent)
//
// Selected Devices
//
alsa_config_list=new QListBox(this);
alsa_config_list=new Q3ListBox(this);
alsa_config_list->setFont(font);
alsa_config_label=new QLabel(alsa_config_list,tr("Active Sound Devices"),this);
alsa_config_label->setFont(label_font);
alsa_config_label->setAlignment(AlignLeft|AlignVCenter);
alsa_config_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Save Button
@@ -254,7 +258,7 @@ void MainWidget::closeEvent(QCloseEvent *e)
}
void MainWidget::LoadList(QListBox *system,QListBox *config)
void MainWidget::LoadList(Q3ListBox *system,Q3ListBox *config)
{
for(unsigned i=0;i<alsa_alsa->cards();i++) {
for(int j=0;j<alsa_alsa->pcmDevices(i);j++) {
@@ -297,7 +301,7 @@ bool MainWidget::PcmUnused(int card,int device)
}
void MainWidget::MoveItem(QListBox *src,QListBox *dest)
void MainWidget::MoveItem(Q3ListBox *src,Q3ListBox *dest)
{
AlsaItem *item=(AlsaItem *)src->selectedItem();
if(item==NULL) {

13
utils/rdalsaconfig/rdalsaconfig.h
View File

@@ -22,8 +22,11 @@
#define RDALSACONFIG_H
#include <qwidget.h>
#include <qlistbox.h>
#include <q3listbox.h>
#include <qlabel.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <QCloseEvent>
#include <rdtransportbutton.h>
@@ -55,13 +58,13 @@ class MainWidget : public QWidget
void closeEvent(QCloseEvent *e);
private:
void LoadList(QListBox *system,QListBox *config);
void LoadList(Q3ListBox *system,Q3ListBox *config);
bool PcmUnused(int card,int device);
void MoveItem(QListBox *src,QListBox *dest);
void MoveItem(Q3ListBox *src,Q3ListBox *dest);
QLabel *alsa_system_label;
QListBox *alsa_system_list;
Q3ListBox *alsa_system_list;
QLabel *alsa_config_label;
QListBox *alsa_config_list;
Q3ListBox *alsa_config_list;
RDTransportButton *alsa_up_button;
RDTransportButton *alsa_down_button;
QPushButton *alsa_save_button;