mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-15 17:12:36 +02:00
2014-10-16 Fred Gleason <fredg@paravelsystems.com>
* Added support for 'HPI_ADAPTER_MODE_9OSTREAM', 'HPI_ADAPTER_MODE_9OSTREAM' and 'HPI_ADAPTER_MODE_9OSTREAM' modes in 'utils/rdhpiinfo/change_mode.cpp' and 'utils/rdhpiinfo/rdhpiinfo.cpp'. * Implemented proper labeling for 'HPI_ADAPTER_MODE_16OSTREAM' mode with ASI6x85 adapters.
This commit is contained in:
Fred Gleason
parent
381726279e
commit
c158b187f0
@ -14553,3 +14553,10 @@
|
||||
2014-10-10 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Adjusted display of Talk Time in button widget to allow for display
|
||||
of lengths greater than :59 [GitHub issue #000018].
|
||||
2014-10-16 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added support for 'HPI_ADAPTER_MODE_9OSTREAM',
|
||||
'HPI_ADAPTER_MODE_9OSTREAM' and 'HPI_ADAPTER_MODE_9OSTREAM' modes
|
||||
in 'utils/rdhpiinfo/change_mode.cpp' and
|
||||
'utils/rdhpiinfo/rdhpiinfo.cpp'.
|
||||
* Implemented proper labeling for 'HPI_ADAPTER_MODE_16OSTREAM' mode
|
||||
with ASI6x85 adapters.
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// Change the mode of an AudioScience Adapter.
|
||||
//
|
||||
// (C) Copyright 2002-2005 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: change_mode.cpp,v 1.6 2011/05/18 14:38:13 cvs Exp $
|
||||
// (C) Copyright 2002-2014 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
|
||||
@ -40,7 +38,7 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
setMinimumHeight(sizeHint().height());
|
||||
setMaximumHeight(sizeHint().height());
|
||||
|
||||
setCaption(tr("RdhpiInfo - Change Mode"));
|
||||
setCaption(tr("RdHPIInfo - Change Mode"));
|
||||
|
||||
//
|
||||
// Create Fonts
|
||||
@ -53,8 +51,7 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
//
|
||||
// Adapter Type
|
||||
//
|
||||
QLabel *label=new QLabel(QString().sprintf("AudioScience %X",type),
|
||||
this,"type_label");
|
||||
QLabel *label=new QLabel(QString().sprintf("AudioScience %X",type),this);
|
||||
label->setGeometry(10,10,sizeHint().width()-20,15);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignCenter);
|
||||
@ -62,11 +59,11 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
//
|
||||
// Adapter Mode
|
||||
//
|
||||
change_mode_box=new QComboBox(this,"change_type_box");
|
||||
change_mode_box=new QComboBox(this);
|
||||
change_mode_box->setGeometry(10,35,sizeHint().width()-20,22);
|
||||
change_mode_box->setFont(font);
|
||||
int index=0;
|
||||
for(uint32_t i=1;i<11;i++) {
|
||||
for(uint32_t i=1;i<14;i++) {
|
||||
if(HPI_AdapterSetModeEx(NULL,card,i,HPI_ADAPTER_MODE_QUERY)==0) {
|
||||
switch(i) {
|
||||
case HPI_ADAPTER_MODE_4OSTREAM:
|
||||
@ -86,16 +83,7 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_16OSTREAM:
|
||||
switch(type) {
|
||||
case 0x6585:
|
||||
change_mode_box->
|
||||
insertItem(tr("Multichannel Surround (Two Output Streams)"));
|
||||
break;
|
||||
|
||||
default:
|
||||
change_mode_box->insertItem(tr("Sixteen Output Streams"));
|
||||
break;
|
||||
}
|
||||
change_mode_box->insertItem(tr("Sixteen Output Streams"));
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_1OSTREAM:
|
||||
@ -118,6 +106,18 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
change_mode_box->insertItem(tr("Surround Sound [SSX]"));
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_9OSTREAM:
|
||||
change_mode_box->insertItem(tr("Nine Output Stream"));
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_MONO:
|
||||
change_mode_box->insertItem(tr("Mono Mode"));
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_LOW_LATENCY:
|
||||
change_mode_box->insertItem(tr("Low Latency Mode"));
|
||||
break;
|
||||
|
||||
default:
|
||||
str=QString(tr("Unknown"));
|
||||
change_mode_box->
|
||||
@ -137,7 +137,7 @@ ChangeMode::ChangeMode(unsigned short card,unsigned short type,int mode,
|
||||
//
|
||||
// Ok Button
|
||||
//
|
||||
QPushButton *ok_button=new QPushButton(this,"ok_button");
|
||||
QPushButton *ok_button=new QPushButton(this);
|
||||
ok_button->setGeometry(sizeHint().width()-140,sizeHint().height()-40,60,30);
|
||||
ok_button->setDefault(true);
|
||||
ok_button->setFont(font);
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
//
|
||||
// A Qt-based application for display information on ASI cards.
|
||||
//
|
||||
// (C) Copyright 2002-2005 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $Id: rdhpiinfo.cpp,v 1.8.6.4 2014/01/21 21:59:34 cvs Exp $
|
||||
// (C) Copyright 2002-2014 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
|
||||
@ -77,25 +75,23 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
// HPI Version
|
||||
//
|
||||
HpiErr(HPI_SubSysGetVersionEx(NULL,&hpi_version),"HPI_SubSysGetVersionEx");
|
||||
QLabel *label=new QLabel(tr("HPI Version:"),this,"hpi_version_label");
|
||||
QLabel *label=new QLabel(tr("HPI Version:"),this);
|
||||
label->setGeometry(10,10,85,20);
|
||||
label->setFont(label_font);
|
||||
label=new QLabel(QString().sprintf("%X.%02X.%02X",
|
||||
label=new QLabel(QString().sprintf("%d.%02d.%02d",
|
||||
(unsigned)((hpi_version>>16)&0xffff),
|
||||
(unsigned)((hpi_version>>8)&0xff),
|
||||
(unsigned)hpi_version&0xff),
|
||||
this,"hpi_version");
|
||||
(unsigned)hpi_version&0xff),this);
|
||||
label->setGeometry(100,10,100,20);
|
||||
label->setFont(font);
|
||||
|
||||
//
|
||||
// Adapter Name
|
||||
//
|
||||
info_name_box=new QComboBox(this,"info_name_box");
|
||||
info_name_box=new QComboBox(this);
|
||||
info_name_box->setGeometry(100,34,sizeHint().width()-110,20);
|
||||
info_name_box->setFont(font);
|
||||
info_name_label=new QLabel(info_name_box,tr("Adapter:"),
|
||||
this,"info_name_label");
|
||||
info_name_label=new QLabel(info_name_box,tr("Adapter:"),this);
|
||||
info_name_label->setGeometry(10,34,85,20);
|
||||
info_name_label->setFont(label_font);
|
||||
info_name_label->setAlignment(AlignRight|AlignVCenter);
|
||||
@ -105,11 +101,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Adapter Index
|
||||
//
|
||||
label=new QLabel(tr("Adapter Index:"),this,"index_number_label");
|
||||
label=new QLabel(tr("Adapter Index:"),this);
|
||||
label->setGeometry(10,58,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_index_label=new QLabel(this,"info_index_label");
|
||||
info_index_label=new QLabel(this);
|
||||
info_index_label->setGeometry(120,58,100,20);
|
||||
info_index_label->setFont(font);
|
||||
info_index_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -117,11 +113,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Serial Number
|
||||
//
|
||||
label=new QLabel(tr("Serial Number:"),this,"serial_number_label");
|
||||
label=new QLabel(tr("Serial Number:"),this);
|
||||
label->setGeometry(10,78,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_serial_label=new QLabel(this,"info_serial_label");
|
||||
info_serial_label=new QLabel(this);
|
||||
info_serial_label->setGeometry(120,78,100,20);
|
||||
info_serial_label->setFont(font);
|
||||
info_serial_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -129,11 +125,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Output Streams
|
||||
//
|
||||
label=new QLabel(tr("Input Streams:"),this,"input_streams_label");
|
||||
label=new QLabel(tr("Input Streams:"),this);
|
||||
label->setGeometry(10,98,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_istreams_label=new QLabel(this,"info_istreams_label");
|
||||
info_istreams_label=new QLabel(this);
|
||||
info_istreams_label->setGeometry(120,98,100,20);
|
||||
info_istreams_label->setFont(font);
|
||||
info_istreams_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -141,11 +137,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Input Streams
|
||||
//
|
||||
label=new QLabel(tr("Output Streams:"),this,"output_streams_label");
|
||||
label=new QLabel(tr("Output Streams:"),this);
|
||||
label->setGeometry(10,118,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_ostreams_label=new QLabel(this,"info_ostreams_label");
|
||||
info_ostreams_label=new QLabel(this);
|
||||
info_ostreams_label->setGeometry(120,118,100,20);
|
||||
info_ostreams_label->setFont(font);
|
||||
info_ostreams_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -153,11 +149,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// DSP Version
|
||||
//
|
||||
label=new QLabel(tr("DSP Version:"),this,"dsp_version_label");
|
||||
label=new QLabel(tr("DSP Version:"),this);
|
||||
label->setGeometry(10,138,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_dsp_label=new QLabel(this,"info_dsp_label");
|
||||
info_dsp_label=new QLabel(this);
|
||||
info_dsp_label->setGeometry(120,138,100,20);
|
||||
info_dsp_label->setFont(font);
|
||||
info_dsp_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -165,11 +161,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Adapter Version
|
||||
//
|
||||
label=new QLabel(tr("Adapter Version:"),this,"adapter_version_label");
|
||||
label=new QLabel(tr("Adapter Version:"),this);
|
||||
label->setGeometry(10,158,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_adapter_label=new QLabel(this,"info_adapter_label");
|
||||
info_adapter_label=new QLabel(this);
|
||||
info_adapter_label->setGeometry(120,158,100,20);
|
||||
info_adapter_label->setFont(font);
|
||||
info_adapter_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -177,11 +173,11 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Adapter Mode
|
||||
//
|
||||
label=new QLabel(tr("Adapter Mode:"),this,"adapter_mode_label");
|
||||
label=new QLabel(tr("Adapter Mode:"),this);
|
||||
label->setGeometry(10,178,105,20);
|
||||
label->setFont(label_font);
|
||||
label->setAlignment(AlignRight|AlignVCenter);
|
||||
info_mode_label=new QLabel(this,"info_mode_label");
|
||||
info_mode_label=new QLabel(this);
|
||||
info_mode_label->setGeometry(120,178,sizeHint().width()-130,20);
|
||||
info_mode_label->setFont(font);
|
||||
info_mode_label->setAlignment(AlignLeft|AlignVCenter);
|
||||
@ -190,7 +186,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
// Change Mode Button
|
||||
//
|
||||
info_changemode_button=
|
||||
new QPushButton(tr("Change Card Mode"),this,"info_changemode_button");
|
||||
new QPushButton(tr("Change Card Mode"),this);
|
||||
info_changemode_button->setGeometry(130,200,170,30);
|
||||
info_changemode_button->setFont(label_font);
|
||||
connect(info_changemode_button,SIGNAL(clicked()),
|
||||
@ -199,7 +195,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// Close Button
|
||||
//
|
||||
QPushButton *button=new QPushButton(tr("Close"),this,"close_button");
|
||||
QPushButton *button=new QPushButton(tr("Close"),this);
|
||||
button->setGeometry(sizeHint().width()-60,sizeHint().height()-40,50,30);
|
||||
button->setFont(label_font);
|
||||
connect(button,SIGNAL(clicked()),qApp,SLOT(quit()));
|
||||
@ -275,16 +271,7 @@ void MainWidget::nameActivatedData(int id)
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_16OSTREAM:
|
||||
switch(hpi_type[card]) {
|
||||
case 0x6585:
|
||||
info_mode_label->
|
||||
setText(tr("Multichannel Surround (Two Output Streams)"));
|
||||
break;
|
||||
|
||||
default:
|
||||
info_mode_label->setText(tr("Sixteen Output Streams"));
|
||||
break;
|
||||
}
|
||||
info_mode_label->setText(tr("Sixteen Output Streams"));
|
||||
info_changemode_button->setEnabled(true);
|
||||
break;
|
||||
|
||||
@ -313,6 +300,21 @@ void MainWidget::nameActivatedData(int id)
|
||||
info_changemode_button->setEnabled(true);
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_9OSTREAM:
|
||||
info_mode_label->setText(tr("Nine Output Stream"));
|
||||
info_changemode_button->setEnabled(true);
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_MONO:
|
||||
info_mode_label->setText(tr("Mono Mode"));
|
||||
info_changemode_button->setEnabled(true);
|
||||
break;
|
||||
|
||||
case HPI_ADAPTER_MODE_LOW_LATENCY:
|
||||
info_mode_label->setText(tr("Low Latency Mode"));
|
||||
info_changemode_button->setEnabled(true);
|
||||
break;
|
||||
|
||||
default:
|
||||
info_mode_label->setText(tr("N/A"));
|
||||
info_changemode_button->setDisabled(true);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user