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/rdsoftkeys/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rdsoftkeys
##
## (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2006,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)
@@ -33,7 +31,7 @@ dist_rdsoftkeys_SOURCES = rdsoftkeys.cpp rdsoftkeys.h
nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp
rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdsoftkeys.pro

15
utils/rdsoftkeys/rdsoftkeys.cpp
View File

@@ -2,7 +2,7 @@
//
// A utility for sending RML Commands
//
// (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2006,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
@@ -34,6 +34,9 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
#include <qsettings.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QPixmap>
#include <rdprofile.h>
#include <rd.h>
@@ -48,7 +51,7 @@
#include "../icons/rivendell-22x22.xpm"
MainWidget::MainWidget(QWidget *parent)
: QMainWindow(parent)
: Q3MainWindow(parent)
{
key_ysize=70;
@@ -86,7 +89,7 @@ MainWidget::MainWidget(QWidget *parent)
//
// RML Send Socket
//
key_socket=new QSocketDevice(QSocketDevice::Datagram);
key_socket=new Q3SocketDevice(Q3SocketDevice::Datagram);
//
// Create Buttons
@@ -112,7 +115,7 @@ MainWidget::MainWidget(QWidget *parent)
unsigned row=0;
while(!(rmlcmd=profile->stringValue("SoftKeys",QString().
sprintf("Command%d",n+1),"")).isEmpty()) {
for(unsigned i=0;i<rmlcmd.length();i++) {
for(int i=0;i<rmlcmd.length();i++) {
if(rmlcmd.at(i)==':') {
key_macros.push_back(rmlcmd.right(rmlcmd.length()-(i+1)));
key_addrs.push_back(rmlcmd.left(i));
@@ -295,14 +298,14 @@ int main(int argc,char *argv[])
qt_path=tr_path;
#else
tr_path=QString(PREFIX)+QString("/share/srlabs/");
qt_path=QString(QTDIR)+QString("/translation/");
qt_path=QString("/usr/share/qt4/translation/");
#endif // WIN32
QTranslator qt(0);
qt.load(qt_path+QString("qt_")+QTextCodec::locale(),".");
a.installTranslator(&qt);
QTranslator libradio(0);
libradio.load(tr_path+QString("libradio_")+QTextCodec::locale(),".");
libradio.load(tr_path+QString("librd_")+QTextCodec::locale(),".");
a.installTranslator(&libradio);
QTranslator tests(0);

10
utils/rdsoftkeys/rdsoftkeys.h
View File

@@ -23,11 +23,13 @@
#include <vector>
#include <qmainwindow.h>
#include <q3mainwindow.h>
#include <qsize.h>
#include <qsizepolicy.h>
#include <qpixmap.h>
#include <qsocketdevice.h>
#include <q3socketdevice.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <rdmacro.h>
@@ -37,7 +39,7 @@
#define RDSOFTKEYS_USAGE "[--map-file=<filename>]\n\nWhere <filename> is the name of the file load soft key definitions from.\nThe default value is master Rivendell configuration file.\n"
#define RDSOFTKEYS_DEFAULT_COLUMNS 1
class MainWidget : public QMainWindow
class MainWidget : public Q3MainWindow
{
Q_OBJECT
public:
@@ -52,7 +54,7 @@ class MainWidget : public QMainWindow
private:
QString WrapText(QWidget *w,const QString &text);
QPixmap *key_icon_map;
QSocketDevice *key_socket;
Q3SocketDevice *key_socket;
unsigned key_columns;
unsigned key_ysize;
std::vector<QString> key_macros;