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

2019-08-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored rdalsaconfig(8) to use ALSA device IDs rather than
	ordinal numbers in asound.confO(5).
This commit is contained in:
Fred Gleason
2019-08-24 09:16:18 -04:00
parent e62b02f179
commit f6d220c56c
12 changed files with 541 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
utils/rdalsaconfig/rdalsaconfig.h
View File

@@ -2,7 +2,7 @@
//
// A Qt-based application to display info about ALSA cards.
//
// (C) Copyright 2009-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2009-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
@@ -22,13 +22,13 @@
#define RDALSACONFIG_H
#include <qwidget.h>
#include <q3listbox.h>
#include <qlistview.h>
#include <qlabel.h>
#include <rdtransportbutton.h>
#include <rd.h>
#include <rdalsa.h>
#include "rdalsamodel.h"
#define RDALSACONFIG_USAGE "[--asoundrc-file=<filename>] [--autogen] [--manage-daemons]\n\nGenerate an ALSA sound card configuration for Rivendell.\n\nThe following options are available:\n\n --asoundrc-file=<filename>\n Read and write configuration from <filename> (default value \n \"/etc/asound.conf\").\n\n --autogen\n Generate and save a configuration containing all available PCM devices\n and then exit.\n\n --manage-daemons\n Restart the Rivendell daemons as necessary to make configuration\n changes active (requires root permission).\n\n"
@@ -45,8 +45,6 @@ class MainWidget : public QWidget
QSizePolicy sizePolicy() const;
private slots:
void upData();
void downData();
void saveData();
void cancelData();
@@ -55,26 +53,15 @@ class MainWidget : public QWidget
void closeEvent(QCloseEvent *e);
private:
void LoadList(Q3ListBox *system,Q3ListBox *config);
bool PcmUnused(int card,int device);
void MoveItem(Q3ListBox *src,Q3ListBox *dest);
void LoadConfig();
void SaveConfig() const;
QLabel *alsa_system_label;
Q3ListBox *alsa_system_list;
QLabel *alsa_config_label;
Q3ListBox *alsa_config_list;
RDTransportButton *alsa_up_button;
RDTransportButton *alsa_down_button;
QLabel *alsa_description_label;
QListView *alsa_system_list;
RDAlsaModel *alsa_system_model;
QStringList alsa_other_lines;
QPushButton *alsa_save_button;
QPushButton *alsa_cancel_button;
RDAlsa *alsa_alsa;
};
class Autogen : public QObject
{
Q_OBJECT
public:
Autogen(QObject *parent=0);
};