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

2014-09-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDLiveWire::loadSettings()' method in 'lib/rdlivewire.cpp'
	and 'lib/rdlivewire.h'.
	* Fixed a bug in the 'Configure RDCatch' dialog that caused
	the 'Switcher Matrix' and 'Switcher Output' dropdowns to fail to
	be populated for a LiveWire LWRP Audio switcher device in
	'rdadmin/edit_decks.cpp' and 'rdadmin/edit_decks.h'.
This commit is contained in:
Fred Gleason
2014-09-03 18:58:24 -04:00
parent 35b346fc59
commit c3870ac28f
17 changed files with 319 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rdadmin/edit_decks.h
View File

@@ -23,6 +23,8 @@
#ifndef EDIT_DECKS_H
#define EDIT_DECKS_H
#include <vector>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qcombobox.h>
@@ -40,8 +42,7 @@ class EditDecks : public QDialog
{
Q_OBJECT
public:
EditDecks(RDStation *station,RDStation *cae_station,
QWidget *parent=0,const char *name=0);
EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent=0);
~EditDecks();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
@@ -64,6 +65,7 @@ class EditDecks : public QDialog
void WriteRecord(int chan);
int GetMatrix();
int GetOutput();
QStringList GetActiveOutputMatrices();
RDCatchConf *edit_catch_conf;
RDDeck *edit_record_deck;
RDDeck *edit_play_deck;
@@ -87,6 +89,7 @@ class EditDecks : public QDialog
QComboBox *edit_swstation_box;
QLabel *edit_swmatrix_label;
QComboBox *edit_swmatrix_box;
std::vector<int> edit_matrix_ids;
QLabel *edit_swoutput_label;
QComboBox *edit_swoutput_box;
QLabel *edit_swdelay_label;