mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 09:03:40 +02:00
2018-08-07 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'pam_rd' plug-in. * Removed rdchunk(1). * Upgraded Qt3 to Qt4.
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
## automake.am
|
||||
## Makefile.am
|
||||
##
|
||||
## Automake.am for rivendell/tests
|
||||
##
|
||||
## (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
|
||||
## (C) Copyright 2002-2006,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 @QT_CXXFLAGS@ -I$(top_srcdir)/lib
|
||||
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
|
||||
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
|
||||
LIBS = -L$(top_srcdir)/lib
|
||||
MOC = @QT_MOC@
|
||||
|
||||
# The dependency for qt's Meta Object Compiler (moc)
|
||||
@@ -46,55 +44,55 @@ noinst_PROGRAMS = audio_convert_test\
|
||||
wav_chunk_test
|
||||
|
||||
dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h
|
||||
audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_audio_export_test_SOURCES = audio_export_test.cpp audio_export_test.h
|
||||
audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h
|
||||
audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h
|
||||
audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h
|
||||
datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_db_charset_test_SOURCES = db_charset_test.cpp db_charset_test.h
|
||||
db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_log_unlink_test_SOURCES = log_unlink_test.cpp log_unlink_test.h
|
||||
nodist_log_unlink_test_SOURCES = moc_log_unlink_test.cpp
|
||||
log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_mcast_recv_test_SOURCES = mcast_recv_test.cpp mcast_recv_test.h
|
||||
nodist_mcast_recv_test_SOURCES = moc_mcast_recv_test.cpp
|
||||
mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_rdxml_parse_test_SOURCES = rdxml_parse_test.cpp rdxml_parse_test.h
|
||||
rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_reserve_carts_test_SOURCES = reserve_carts_test.cpp reserve_carts_test.h
|
||||
reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h
|
||||
stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_test_hash_SOURCES = test_hash.cpp test_hash.h
|
||||
test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_test_pam_SOURCES = test_pam.cpp test_pam.h
|
||||
test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_timer_test_SOURCES = timer_test.cpp timer_test.h
|
||||
nodist_timer_test_SOURCES = moc_timer_test.cpp
|
||||
timer_test_LDADD = -lqui
|
||||
timer_test_LDADD = @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_upload_test_SOURCES = upload_test.cpp upload_test.h
|
||||
upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h
|
||||
wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
|
||||
wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
|
||||
|
||||
EXTRA_DIST = rivendell_standard.txt\
|
||||
visualtraffic.txt
|
||||
|
@@ -29,7 +29,7 @@
|
||||
MainObject::MainObject(QObject *parent)
|
||||
:QObject(parent)
|
||||
{
|
||||
unsigned schema=0;
|
||||
int schema=0;
|
||||
|
||||
destination_settings=new RDSettings();
|
||||
start_point=-1;
|
||||
@@ -172,8 +172,7 @@ MainObject::MainObject(QObject *parent)
|
||||
// Open Database
|
||||
//
|
||||
QString err (tr("audio_convert_test: "));
|
||||
QSqlDatabase *db=RDInitDb(&schema,&err);
|
||||
if(!db) {
|
||||
if(!RDOpenDb(&schema,&err,rdconfig)) {
|
||||
fprintf(stderr,err.ascii());
|
||||
delete cmd;
|
||||
exit(256);
|
||||
|
@@ -36,7 +36,7 @@ MainObject::MainObject(QObject *parent)
|
||||
QString date="";
|
||||
QString datetime="";
|
||||
QString service="";
|
||||
unsigned schema=0;
|
||||
int schema=0;
|
||||
|
||||
//
|
||||
// Read Command Options
|
||||
@@ -84,8 +84,7 @@ MainObject::MainObject(QObject *parent)
|
||||
// Open Database
|
||||
//
|
||||
QString err (tr("datedecode_test: "));
|
||||
QSqlDatabase *db=RDInitDb(&schema,&err);
|
||||
if(!db) {
|
||||
if(!RDOpenDb(&schema,&err,config)) {
|
||||
fprintf(stderr,err.ascii());
|
||||
delete cmd;
|
||||
exit(256);
|
||||
|
@@ -38,7 +38,7 @@ MainObject::MainObject(QObject *parent)
|
||||
:QObject(parent)
|
||||
{
|
||||
test_import_source=RDSvc::Traffic;
|
||||
unsigned schema=0;
|
||||
int schema=0;
|
||||
|
||||
//
|
||||
// Read Command Options
|
||||
@@ -89,8 +89,7 @@ MainObject::MainObject(QObject *parent)
|
||||
// Open Database
|
||||
//
|
||||
QString err (tr("upload_test: "));
|
||||
QSqlDatabase *db=RDInitDb(&schema,&err);
|
||||
if(!db) {
|
||||
if(!RDOpenDb(&schema,&err,test_config)) {
|
||||
fprintf(stderr,err.ascii());
|
||||
delete cmd;
|
||||
exit(256);
|
||||
|
@@ -37,7 +37,7 @@ MainObject::MainObject(QObject *parent)
|
||||
{
|
||||
QString filename="";
|
||||
QFile *file=NULL;
|
||||
QString line;
|
||||
char line[1025];
|
||||
QString xml="";
|
||||
|
||||
//
|
||||
@@ -66,7 +66,7 @@ MainObject::MainObject(QObject *parent)
|
||||
// Read File
|
||||
//
|
||||
file=new QFile(filename);
|
||||
if(!file->open(IO_ReadOnly)) {
|
||||
if(!file->open(QIODevice::ReadOnly)) {
|
||||
fprintf(stderr,"rdxml_parse_test: unable to open \"%s\"\n",
|
||||
(const char *)filename);
|
||||
exit(256);
|
||||
|
@@ -42,7 +42,7 @@ MainObject::MainObject(QObject *parent)
|
||||
bool ok=false;
|
||||
RDGroup *group=NULL;
|
||||
std::vector<unsigned> cart_nums;
|
||||
unsigned schema=0;
|
||||
int schema=0;
|
||||
|
||||
//
|
||||
// Read Command Options
|
||||
@@ -93,8 +93,7 @@ MainObject::MainObject(QObject *parent)
|
||||
// Open Database
|
||||
//
|
||||
QString err (tr("upload_test: "));
|
||||
QSqlDatabase *db=RDInitDb(&schema,&err);
|
||||
if(!db) {
|
||||
if(!RDOpenDb(&schema,&err,config)) {
|
||||
fprintf(stderr,err.ascii());
|
||||
delete cmd;
|
||||
exit(256);
|
||||
|
@@ -19,6 +19,7 @@
|
||||
//
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <qapplication.h>
|
||||
|
||||
|
@@ -37,7 +37,6 @@ MainObject::MainObject(QObject *parent)
|
||||
username="";
|
||||
password="";
|
||||
RDUpload::ErrorCode conv_err;
|
||||
unsigned schema=0;
|
||||
|
||||
//
|
||||
// Open the Database
|
||||
|
@@ -2,7 +2,7 @@
|
||||
//
|
||||
// Test Rivendell file uploading.
|
||||
//
|
||||
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2010,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
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
Reference in New Issue
Block a user