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

2018-08-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/rdcollect/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rdcollect
##
## (C) Copyright 2002-2010,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-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
@@ -19,8 +17,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -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)
@@ -31,7 +29,7 @@ bin_PROGRAMS = rdcollect
dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h
rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdcollect.pro

18
utils/rdcollect/rdcollect.cpp
View File

@@ -83,7 +83,7 @@ MainObject::MainObject(QObject *parent)
// Process Data
//
QStringList src_lines;
for(unsigned i=0;i<source_files.size();i++) {
for(int i=0;i<source_files.size();i++) {
QStringList src_dirs=GetDirectoryList(source_files[i]);
LoadSourceFiles(RDGetBasePart(source_files[i]),src_dirs,&src_lines);
}
@@ -112,7 +112,7 @@ QStringList MainObject::GetDirectoryList(const QString &src_file)
void MainObject::LoadSourceFiles(const QString &src_name,
const QStringList &dirs,QStringList *lines)
{
for(unsigned i=0;i<dirs.size();i++) {
for(int i=0;i<dirs.size();i++) {
LoadSourceFile(dirs[i]+"/"+src_name,lines);
}
}
@@ -121,13 +121,13 @@ void MainObject::LoadSourceFiles(const QString &src_name,
void MainObject::LoadSourceFile(const QString &filename,QStringList *lines)
{
Q_LONG n;
QString line;
char line[1025];
QFile file(filename);
if(!file.open(IO_ReadOnly|IO_Translate)) {
if(!file.open(QIODevice::ReadOnly|QIODevice::Text)) {
return;
}
while((n=file.readLine(line,1024))>0) {
lines->push_back(line.left(line.length()-1));
lines->push_back(QString(line).left(strlen(line)-1));
}
file.close();
}
@@ -140,7 +140,7 @@ void MainObject::SortLines(QStringList *lines,std::vector<unsigned> *index)
//
// Initialize Index
//
for(unsigned i=0;i<lines->size();i++) {
for(int i=0;i<lines->size();i++) {
index->push_back(i);
start_times.push_back(ReadTime((*lines)[i]));
}
@@ -151,7 +151,7 @@ void MainObject::SortLines(QStringList *lines,std::vector<unsigned> *index)
bool modified=true;
while(modified) {
modified=false;
for(unsigned i=1;i<lines->size();i++) {
for(int i=1;i<lines->size();i++) {
if(start_times[i-1]>start_times[i]) {
QTime time=start_times[i-1];
start_times[i-1]=start_times[i];
@@ -174,7 +174,7 @@ int MainObject::WriteOutputFile(const QString &filename,
if((f=fopen(filename,"w"))==NULL) {
return errno;
}
for(unsigned i=0;i<lines.size();i++) {
for(int i=0;i<lines.size();i++) {
fprintf(f,"%s\n",(const char *)lines[index->at(i)]);
}
fclose(f);
@@ -187,7 +187,7 @@ void MainObject::AddDirs(const QString &path,QStringList *dirs)
QDir dir(path);
dir.setFilter(QDir::Dirs);
QStringList list=dir.entryList();
for(unsigned i=0;i<list.size();i++) {
for(int i=0;i<list.size();i++) {
if((list[i]!=".")&&(list[i]!="..")) {
dirs->push_back(path+"/"+list[i]);
AddDirs(path+"/"+list[i],dirs);