Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-01 06:10:10 +01:00
Code Issues Projects Releases Wiki Activity

2023-01-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'single instance' requirement from all modules.
	* Removed the 'Allow Multiple Instances' dropdown from the
	'Configure RDLibrary' dialog in rdadmin(1).
	* Removed the 'Allow Multiple Instances' dropdown from the
	'Configure RDLogEdit' dialog in rdadmin(1).
	* Removed the wmctrl(1) dependency from the 'rivendell' DEB package.
	* Removed the wmctrl(1) dependency from the 'rivendell' RPM package.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-01-30 15:12:42 -05:00
parent 43692497cb
commit 822fb1de92
19 changed files with 25 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rdadmin/edit_rdlibrary.cpp
View File

@@ -2,7 +2,7 @@
//
// Edit an RDLibrary Configuration
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 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
@@ -271,19 +271,6 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
lib_limit_search_label->setGeometry(10,398,175,19);
lib_limit_search_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Allow Multiple Instances
//
lib_singleton_box=new QComboBox(this);
lib_singleton_box->setGeometry(190,422,80,19);
lib_singleton_box->insertItem(0,tr("No"));
lib_singleton_box->insertItem(1,tr("Yes"));
QLabel *lib_singleton_label=
new QLabel(tr("Allow Multiple Instances")+":",this);
lib_singleton_label->setFont(labelFont());
lib_singleton_label->setGeometry(10,422,175,19);
lib_singleton_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Defaults
//
@@ -440,7 +427,6 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station,
lib_editor_box->setCurrentIndex(lib_lib->enableEditor());
lib_converter_box->setCurrentIndex(lib_lib->srcConverter());
lib_limit_search_box->setCurrentIndex((int)lib_lib->limitSearch());
lib_singleton_box->setCurrentIndex(!lib_lib->isSingleton());
}
@@ -565,7 +551,6 @@ void EditRDLibrary::okData()
lib_lib->setSrcConverter(lib_converter_box->currentIndex());
lib_lib->setLimitSearch((RDLibraryConf::SearchLimit)
lib_limit_search_box->currentIndex());
lib_lib->setIsSingleton(lib_singleton_box->currentIndex()==0);
done(0);
}

3
rdadmin/edit_rdlibrary.h
View File

@@ -2,7 +2,7 @@
//
// Edit an RDLibrry Configuration
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 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
@@ -71,7 +71,6 @@ class EditRDLibrary : public RDDialog
QComboBox *lib_editor_box;
QComboBox *lib_converter_box;
QComboBox *lib_limit_search_box;
QComboBox *lib_singleton_box;
};

18
rdadmin/edit_rdlogedit.cpp
View File

@@ -2,7 +2,7 @@
//
// Edit an RDLogedit Configuration
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 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
@@ -282,20 +282,6 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station,
lib_default_transtype_box->insertItem(1,tr("Segue"));
lib_default_transtype_box->insertItem(2,tr("Stop"));
//
// Allow Multiple Instances
//
lib_singleton_box=new QComboBox(this);
lib_singleton_box->setGeometry(180,434,100,19);
QLabel *lib_singleton_label=
new QLabel(tr("Allow Multiple Instances")+":",this);
lib_singleton_label->setFont(labelFont());
lib_singleton_label->setGeometry(0,434,175,19);
lib_singleton_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
lib_singleton_box->insertItem(0,tr("No"));
lib_singleton_box->insertItem(1,tr("Yes"));
//
// Ok Button
//
@@ -379,7 +365,6 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station,
ShowBitRates(lib_format_box->currentIndex(),lib_lib->bitrate());
lib_enable_second_start_box->setCurrentIndex(lib_lib->enableSecondStart());
lib_default_transtype_box->setCurrentIndex(lib_lib->defaultTransType());
lib_singleton_box->setCurrentIndex(!lib_lib->isSingleton());
}
@@ -508,7 +493,6 @@ void EditRDLogedit::okData()
lib_lib->setEnableSecondStart(lib_enable_second_start_box->currentIndex());
lib_lib->setDefaultTransType(
(RDLogLine::TransType)lib_default_transtype_box->currentIndex());
lib_lib->setIsSingleton(lib_singleton_box->currentIndex()==0);
done(0);
}

3
rdadmin/edit_rdlogedit.h
View File

@@ -2,7 +2,7 @@
//
// Edit an RDLogEdit Configuration
//
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 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
@@ -66,7 +66,6 @@ class EditRDLogedit : public RDDialog
QLineEdit *lib_recstartcart_edit;
QLineEdit *lib_recendcart_edit;
QComboBox *lib_default_transtype_box;
QComboBox *lib_singleton_box;
QString lib_filter;
QString lib_group;
};