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

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

9
rdhpi/Makefile.am
View File

@@ -1,12 +1,10 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/mlhpi
##
## by Fred Gleason <fredg@paravelsystems.com>
##
## Use automake to process this into a Makefile.in
##
## (C) Copyright 2002-2007,2016-2018 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -21,8 +19,9 @@
## License along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
CWRAP = ../helpers/cwrap

15
rdhpi/rdhpiplaystream.cpp
View File

@@ -2,7 +2,7 @@
//
// A class for playing Microsoft WAV file on AudioScience HPI devices.
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -25,13 +25,10 @@
#include <sys/stat.h>
#include <syslog.h>
#include <fcntl.h>
#include <qobject.h>
#include <qwidget.h>
#include <qstring.h>
#include <qdatetime.h>
#include <rd.h>
#include <rdapplication.h>
#include "rdhpiplaystream.h"
#include "rdhpisoundcard.h"
@@ -120,6 +117,7 @@ RDHPIPlayStream::RDHPIPlayStream(RDHPISoundCard *card,QWidget *parent)
connect(clock,SIGNAL(timeout()),this,SLOT(tickClock()));
play_timer=new QTimer(this);
play_timer->setSingleShot(true);
connect(play_timer,SIGNAL(timeout()),this,SLOT(pause()));
}
@@ -160,7 +158,7 @@ QString RDHPIPlayStream::errorString(RDHPIPlayStream::Error err)
default:
str=QString(tr("Unknown RDHpiPlayStream Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err);
return QString().sprintf("%s %d\n",str.toUtf8().constData(),err);
break;
}
}
@@ -527,7 +525,7 @@ bool RDHPIPlayStream::play()
is_paused=false;
stopping=false;
if(play_length>0) {
play_timer->start(play_length,true);
play_timer->start(play_length);
start_time=QTime::currentTime();
}
stream_state=RDHPIPlayStream::Playing;
@@ -699,7 +697,8 @@ void RDHPIPlayStream::setPlayLength(int length)
if((diff=length-start_time.msecsTo(current_time))<=0) {
diff=0;
}
play_timer->changeInterval(diff);
play_timer->stop();
play_timer->start(diff);
start_time=current_time;
}
play_length=length;

13
rdhpi/rdhpirecordstream.cpp
View File

@@ -2,7 +2,7 @@
//
// A class for recording Microsoft WAV files.
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-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
@@ -25,10 +25,6 @@
#include <sys/stat.h>
#include <syslog.h>
#include <fcntl.h>
#include <qobject.h>
#include <qwidget.h>
#include <qstring.h>
#include <qdatetime.h>
#include <rdapplication.h>
@@ -100,6 +96,7 @@ RDHPIRecordStream::RDHPIRecordStream(RDHPISoundCard *card,QWidget *parent)
connect(clock,SIGNAL(timeout()),this,SLOT(tickClock()));
length_timer=new QTimer(this);
length_timer->setSingleShot(true);
connect(length_timer,SIGNAL(timeout()),this,SLOT(pause()));
}
@@ -135,7 +132,7 @@ QString RDHPIRecordStream::errorString(RDHPIRecordStream::Error err)
default:
str=QString(tr("Unknown RDHpiRecordStream Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err);
return QString().sprintf("%s %d\n",str.toUtf8().constData(),err);
break;
}
}
@@ -163,7 +160,7 @@ RDHPIRecordStream::Error RDHPIRecordStream::createWave(QString filename)
if(is_open) {
return RDHPIRecordStream::AlreadyOpen;
}
setName(filename);
nameWave(filename);
return createWave();
}
@@ -664,7 +661,7 @@ void RDHPIRecordStream::tickClock()
if((!record_started)&&(is_recording)) {
if(samples_recorded>0) {
if(record_length>0) {
length_timer->start(record_length,true);
length_timer->start(record_length);
}
emit recordStart();
emit stateChanged(card_number,stream_number,4); // RecordStarted

23
rdhpi/rdhpisoundcard.cpp
View File

@@ -750,14 +750,15 @@ void RDHPISoundCard::HPIProbe()
str=QString(tr("Input Stream"));
for(int j=0;j<card_input_streams[i];j++) {
input_stream_description[i][j]=
QString().sprintf("%s - %s %d",(const char *)card_description[i],
(const char *)str,j+1);
QString().sprintf("%s - %s %d",card_description[i].toUtf8().constData(),
str.toUtf8().constData(),j+1);
}
str=QString(tr("Output Stream"));
for(int j=0;j<card_output_streams[i];j++) {
output_stream_description[i][j]=
QString().sprintf("%s - %s %d",(const char *)card_description[i],
(const char *)str,j+1);
QString().sprintf("%s - %s %d",
card_description[i].toUtf8().constData(),
str.toUtf8().constData(),j+1);
}
}
@@ -779,9 +780,9 @@ void RDHPISoundCard::HPIProbe()
&input_stream_volume_control[i][0][k])==0) {
card_input_ports[i]++;
input_port_description[i][k]=
QString().sprintf("%s - %s %d",(const char *)card_description[i],
(const char *)str,
card_input_ports[i]);
QString().sprintf("%s - %s %d",
card_description[i].toUtf8().constData(),
str.toUtf8().constData(),card_input_ports[i]);
}
//
@@ -813,9 +814,9 @@ void RDHPISoundCard::HPIProbe()
output_stream_volume[i][0][k]=true;
card_output_ports[i]++;
output_port_description[i][k]=
QString().sprintf("%s - %s %d",(const char *)card_description[i],
(const char *)str,
card_output_ports[i]);
QString().sprintf("%s - %s %d",
card_description[i].toUtf8().constData(),
str.toUtf8().constData(),card_output_ports[i]);
}
}
LogHpi(HPI_MixerGetControl(NULL,hpi_mixer[i],
@@ -1033,7 +1034,7 @@ void RDHPISoundCard::HPIProbe()
}
}
}
clock_timer=new QTimer(this,"clock_timer");
clock_timer=new QTimer(this);
connect(clock_timer,SIGNAL(timeout()),this,SLOT(clock()));
clock_timer->start(METER_INTERVAL);
}