diff --git a/ChangeLog b/ChangeLog index e7640f5d..fe43ae96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21427,3 +21427,7 @@ * Updated the build package list for RHEL 7 in 'INSTALL'. 2021-04-13 Fred Gleason * Updated the build package list for Ubuntu 20.04 LTS in 'INSTALL'. +2021-04-13 David Klann + * Changed the way in which the VU Meter UDP port is chosen. One + can now specify the base port number and the maximum number of UDP + ports to consider when caed(8) sets up the VU meter port. diff --git a/conf/rd.conf-sample b/conf/rd.conf-sample index d6f4ad37..5049a551 100644 --- a/conf/rd.conf-sample +++ b/conf/rd.conf-sample @@ -164,3 +164,15 @@ TranscodingDelay=0 ; Lock memory in RDAirPlay ; LockRdairplayMemory=Yes + +; Number at which to start looking for available UDP ports for VU +; meters. You should only change this if you have another service +; using UDP Port numbers in the range MeterPortBaseNumber to +; (MeterPortBaseNumber + MeterPortRange) (extremely rare). +; MeterPortBaseNumber=30000 + +; Maximum number of UDP Ports to consider for VU meters. You may need +; to change this if you have many (say, more than 80) Rivendell +; dropboxes configured. Rivendell imposes a hard limit of 999 on this +; setting. +; MeterPortRange=100 diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index d99670d1..c0f0dcef 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -1,4 +1,6 @@ - + + + diff --git a/lib/librd_de.ts b/lib/librd_de.ts index 167301ef..f8e8cd66 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -1,4 +1,6 @@ - + + + diff --git a/lib/librd_es.ts b/lib/librd_es.ts index d803f432..2092f7d0 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -1,4 +1,6 @@ - + + + @@ -1274,7 +1276,7 @@ Color ARTIST - ARTISTA + ARTISTA CLIENT diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index 0df050e0..31a423b0 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -1,4 +1,6 @@ - + + + QObject diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index 5b59c66f..988e7349 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -1,4 +1,6 @@ - + + + diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index 5b59c66f..988e7349 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -1,4 +1,6 @@ - + + + diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index cc22840a..ff76af82 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -1,4 +1,6 @@ - + + + @@ -89,7 +91,7 @@ PLAY - SIMPLES + SIMPLES SEGUE @@ -3281,7 +3283,7 @@ Por Favor, cheque suas configurações e tenbte outra vez. PLAY - SIMPLES + SIMPLES SEGUE diff --git a/lib/rd.h b/lib/rd.h index 6e6782d4..745becaa 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -625,6 +625,18 @@ */ #define RD_GPIO_EVENT_DAYS 30 +/* + * Starting UDP port for cae_meter_socket. + * Default 'MeterPortBaseNumber=' value in rd.conf(5) + */ +#define RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT 30000 + +/* + * Maximum number of UDP ports to consider for cae_meter_socket. + * Default 'MeterPortRange' value in rd.conf(5) + */ +#define RD_METER_SOCKET_PORT_RANGE 100 + /* * Height/Width for QTreeWidget, QTableWidget and QListView widgets */ diff --git a/lib/rdcae.cpp b/lib/rdcae.cpp index a4b733f1..1686846a 100644 --- a/lib/rdcae.cpp +++ b/lib/rdcae.cpp @@ -63,9 +63,15 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent) // Meter Connection // cae_meter_socket=new QUdpSocket(this); - for(int16_t i=30000;i<30100;i++) { - if(cae_meter_socket->bind(i)) { - i=31000; + cae_meter_base_port=cae_config->meterBasePort(); + cae_meter_port_range=cae_config->meterPortRange(); + if(cae_meter_port_range>999) { + cae_meter_port_range=999; + } + for(int16_t i=cae_meter_base_port; + i<(cae_meter_base_port+cae_meter_port_range);i++) { + if(cae_meter_socket->bind(QHostAddress(),i)) { + i=(cae_meter_base_port+cae_meter_port_range)+1; } } diff --git a/lib/rdcae.h b/lib/rdcae.h index a394b10d..db803be2 100644 --- a/lib/rdcae.h +++ b/lib/rdcae.h @@ -111,6 +111,8 @@ class RDCae : public QObject int cae_handle[RD_MAX_CARDS][RD_MAX_STREAMS]; unsigned cae_pos[RD_MAX_CARDS][RD_MAX_STREAMS]; QUdpSocket *cae_meter_socket; + int cae_meter_base_port; + int cae_meter_port_range; short cae_input_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_stream_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; diff --git a/lib/rdconfig.cpp b/lib/rdconfig.cpp index c8659745..10578958 100644 --- a/lib/rdconfig.cpp +++ b/lib/rdconfig.cpp @@ -381,6 +381,18 @@ bool RDConfig::lockRdairplayMemory() const } +int RDConfig::meterBasePort() const +{ + return conf_meter_base_port; +} + + +int RDConfig::meterPortRange() const +{ + return conf_meter_port_range; +} + + uid_t RDConfig::uid() const { return conf_uid; @@ -589,6 +601,10 @@ bool RDConfig::load() profile->boolValue("Hacks","DisableMaintChecks",false); conf_lock_rdairplay_memory= profile->boolValue("Hacks","LockRdairplayMemory",false); + conf_meter_base_port= + profile->intValue("Hacks","MeterPortBaseNumber",RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT); + conf_meter_port_range= + profile->intValue("Hacks","MeterPortRange",RD_METER_SOCKET_PORT_RANGE); if((user=getpwnam(profile->stringValue("Identity","AudioOwner").toUtf8()))!=NULL) { conf_uid=user->pw_uid; } @@ -712,6 +728,8 @@ void RDConfig::clear() conf_jack_ports[1].clear(); conf_disable_maint_checks=false; conf_lock_rdairplay_memory=false; + conf_meter_base_port=RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT; + conf_meter_port_range=RD_METER_SOCKET_PORT_RANGE; conf_uid=65535; conf_gid=65535; conf_pypad_uid=65535; diff --git a/lib/rdconfig.h b/lib/rdconfig.h index 7a165346..d5a2361b 100644 --- a/lib/rdconfig.h +++ b/lib/rdconfig.h @@ -2,7 +2,7 @@ // // A container class for a Rivendell Base Configuration // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 @@ -100,6 +100,8 @@ class RDConfig QString jackPort(int num,int endpt) const; bool disableMaintChecks() const; bool lockRdairplayMemory() const; + int meterBasePort() const; + int meterPortRange() const; bool enableMixerLogging() const; uid_t uid() const; gid_t gid() const; @@ -170,6 +172,8 @@ class RDConfig QString conf_http_user_agent; bool conf_disable_maint_checks; bool conf_lock_rdairplay_memory; + int conf_meter_base_port; + int conf_meter_port_range; std::vector conf_jack_ports[2]; uid_t conf_uid; gid_t conf_gid; diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 8986713e..f26b7c8c 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -1,4 +1,6 @@ - + + + @default diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index a6394063..3dc99f5c 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -1,4 +1,6 @@ - + + + @default diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 38374755..c1254521 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -1,4 +1,6 @@ - + + + @default diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 64c60158..ede1e649 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -1,4 +1,6 @@ - + + + AddFeed diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index e5ec6345..67396b5e 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -1,4 +1,6 @@ - + + + @default diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index e5ec6345..67396b5e 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -1,4 +1,6 @@ - + + + @default diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 9ff6ee46..d6862667 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + @default @@ -3066,7 +3068,7 @@ Isto para popular os recursos de áudio na Base de Dados. Low - Baixa + Baixa None diff --git a/rdairplay/rdairplay_cs.ts b/rdairplay/rdairplay_cs.ts index 9ed40dd9..1d700a7d 100644 --- a/rdairplay/rdairplay_cs.ts +++ b/rdairplay/rdairplay_cs.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_de.ts b/rdairplay/rdairplay_de.ts index 1ef9c4fb..5c1e9b7e 100644 --- a/rdairplay/rdairplay_de.ts +++ b/rdairplay/rdairplay_de.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_es.ts b/rdairplay/rdairplay_es.ts index a99651aa..c5ce732e 100644 --- a/rdairplay/rdairplay_es.ts +++ b/rdairplay/rdairplay_es.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_fr.ts b/rdairplay/rdairplay_fr.ts index ca44d081..a9ac43b1 100644 --- a/rdairplay/rdairplay_fr.ts +++ b/rdairplay/rdairplay_fr.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_nb.ts b/rdairplay/rdairplay_nb.ts index a198638c..7266415a 100644 --- a/rdairplay/rdairplay_nb.ts +++ b/rdairplay/rdairplay_nb.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_nn.ts b/rdairplay/rdairplay_nn.ts index a198638c..7266415a 100644 --- a/rdairplay/rdairplay_nn.ts +++ b/rdairplay/rdairplay_nn.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdairplay/rdairplay_pt_BR.ts b/rdairplay/rdairplay_pt_BR.ts index 7a16bcb2..7cbd55d6 100644 --- a/rdairplay/rdairplay_pt_BR.ts +++ b/rdairplay/rdairplay_pt_BR.ts @@ -1,4 +1,6 @@ - + + + EditEvent diff --git a/rdcartslots/rdcartslots_de.ts b/rdcartslots/rdcartslots_de.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_de.ts +++ b/rdcartslots/rdcartslots_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_es.ts b/rdcartslots/rdcartslots_es.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_es.ts +++ b/rdcartslots/rdcartslots_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_fr.ts b/rdcartslots/rdcartslots_fr.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_fr.ts +++ b/rdcartslots/rdcartslots_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_nb.ts b/rdcartslots/rdcartslots_nb.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_nb.ts +++ b/rdcartslots/rdcartslots_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_nn.ts b/rdcartslots/rdcartslots_nn.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_nn.ts +++ b/rdcartslots/rdcartslots_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcartslots/rdcartslots_pt_BR.ts b/rdcartslots/rdcartslots_pt_BR.ts index 11500427..fe5743fe 100644 --- a/rdcartslots/rdcartslots_pt_BR.ts +++ b/rdcartslots/rdcartslots_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdcastmanager/rdcastmanager_cs.ts b/rdcastmanager/rdcastmanager_cs.ts index 1909bf5a..e8c35076 100644 --- a/rdcastmanager/rdcastmanager_cs.ts +++ b/rdcastmanager/rdcastmanager_cs.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_de.ts b/rdcastmanager/rdcastmanager_de.ts index fd564c40..0209c42d 100644 --- a/rdcastmanager/rdcastmanager_de.ts +++ b/rdcastmanager/rdcastmanager_de.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_es.ts b/rdcastmanager/rdcastmanager_es.ts index d3efe8fd..7b6fb2ce 100644 --- a/rdcastmanager/rdcastmanager_es.ts +++ b/rdcastmanager/rdcastmanager_es.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_fr.ts b/rdcastmanager/rdcastmanager_fr.ts index 03b014c8..35f6398d 100644 --- a/rdcastmanager/rdcastmanager_fr.ts +++ b/rdcastmanager/rdcastmanager_fr.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_nb.ts b/rdcastmanager/rdcastmanager_nb.ts index 51900023..c1e6f454 100644 --- a/rdcastmanager/rdcastmanager_nb.ts +++ b/rdcastmanager/rdcastmanager_nb.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_nn.ts b/rdcastmanager/rdcastmanager_nn.ts index 51900023..c1e6f454 100644 --- a/rdcastmanager/rdcastmanager_nn.ts +++ b/rdcastmanager/rdcastmanager_nn.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcastmanager/rdcastmanager_pt_BR.ts b/rdcastmanager/rdcastmanager_pt_BR.ts index 183fcbb0..402f6b20 100644 --- a/rdcastmanager/rdcastmanager_pt_BR.ts +++ b/rdcastmanager/rdcastmanager_pt_BR.ts @@ -1,4 +1,6 @@ - + + + EditCast diff --git a/rdcatch/rdcatch_cs.ts b/rdcatch/rdcatch_cs.ts index c9d12e5b..e6ea74aa 100644 --- a/rdcatch/rdcatch_cs.ts +++ b/rdcatch/rdcatch_cs.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_de.ts b/rdcatch/rdcatch_de.ts index 83cf99de..ddbfc2df 100644 --- a/rdcatch/rdcatch_de.ts +++ b/rdcatch/rdcatch_de.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_es.ts b/rdcatch/rdcatch_es.ts index 9af87158..ccb400b0 100644 --- a/rdcatch/rdcatch_es.ts +++ b/rdcatch/rdcatch_es.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_fr.ts b/rdcatch/rdcatch_fr.ts index 48f1c7d6..4dc13104 100644 --- a/rdcatch/rdcatch_fr.ts +++ b/rdcatch/rdcatch_fr.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_nb.ts b/rdcatch/rdcatch_nb.ts index a72a1082..e6665257 100644 --- a/rdcatch/rdcatch_nb.ts +++ b/rdcatch/rdcatch_nb.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_nn.ts b/rdcatch/rdcatch_nn.ts index a72a1082..e6665257 100644 --- a/rdcatch/rdcatch_nn.ts +++ b/rdcatch/rdcatch_nn.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdcatch/rdcatch_pt_BR.ts b/rdcatch/rdcatch_pt_BR.ts index 0113c3a1..09b44005 100644 --- a/rdcatch/rdcatch_pt_BR.ts +++ b/rdcatch/rdcatch_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddRecording diff --git a/rdhpi/rdhpi_cs.ts b/rdhpi/rdhpi_cs.ts index 1255ec89..bfcfb818 100644 --- a/rdhpi/rdhpi_cs.ts +++ b/rdhpi/rdhpi_cs.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_de.ts b/rdhpi/rdhpi_de.ts index 1293713f..602d623f 100644 --- a/rdhpi/rdhpi_de.ts +++ b/rdhpi/rdhpi_de.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_es.ts b/rdhpi/rdhpi_es.ts index d223d4d2..f6e160f9 100644 --- a/rdhpi/rdhpi_es.ts +++ b/rdhpi/rdhpi_es.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_fr.ts b/rdhpi/rdhpi_fr.ts index d223d4d2..f6e160f9 100644 --- a/rdhpi/rdhpi_fr.ts +++ b/rdhpi/rdhpi_fr.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_nb.ts b/rdhpi/rdhpi_nb.ts index d85ea3fb..c5ca7382 100644 --- a/rdhpi/rdhpi_nb.ts +++ b/rdhpi/rdhpi_nb.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_nn.ts b/rdhpi/rdhpi_nn.ts index d85ea3fb..c5ca7382 100644 --- a/rdhpi/rdhpi_nn.ts +++ b/rdhpi/rdhpi_nn.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdhpi/rdhpi_pt_BR.ts b/rdhpi/rdhpi_pt_BR.ts index ae8300cc..c679430f 100644 --- a/rdhpi/rdhpi_pt_BR.ts +++ b/rdhpi/rdhpi_pt_BR.ts @@ -1,4 +1,6 @@ - + + + RDHPIPlayStream diff --git a/rdlibrary/rdlibrary_cs.ts b/rdlibrary/rdlibrary_cs.ts index e7c20967..9542df4e 100644 --- a/rdlibrary/rdlibrary_cs.ts +++ b/rdlibrary/rdlibrary_cs.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1363,9 +1365,9 @@ Přesto smazat? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Smazání vozíku %06u vyprázdní také schránku - Přesto pokračovat? + Přesto pokračovat? Empty Clipboard diff --git a/rdlibrary/rdlibrary_de.ts b/rdlibrary/rdlibrary_de.ts index 7e43ba50..9d72feba 100644 --- a/rdlibrary/rdlibrary_de.ts +++ b/rdlibrary/rdlibrary_de.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1340,9 +1342,9 @@ verwendet. Trotzdem löschen? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Den Cart %06u zu löschen wird auch die Zwischenablage leeren - Trotzdem fortfahren? + Trotzdem fortfahren? Empty Clipboard diff --git a/rdlibrary/rdlibrary_es.ts b/rdlibrary/rdlibrary_es.ts index c71d7d5f..37e5d5fb 100644 --- a/rdlibrary/rdlibrary_es.ts +++ b/rdlibrary/rdlibrary_es.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1361,9 +1363,9 @@ Do you still want to delete it? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Al eliminar el cartucho %06u también se vaciará el portapapeles. - ¿Desea continuar? + ¿Desea continuar? rdlibrary : diff --git a/rdlibrary/rdlibrary_fr.ts b/rdlibrary/rdlibrary_fr.ts index 46b8a689..850fa220 100644 --- a/rdlibrary/rdlibrary_fr.ts +++ b/rdlibrary/rdlibrary_fr.ts @@ -1,4 +1,6 @@ - + + + AudioCart diff --git a/rdlibrary/rdlibrary_nb.ts b/rdlibrary/rdlibrary_nb.ts index b08dd339..4c502525 100644 --- a/rdlibrary/rdlibrary_nb.ts +++ b/rdlibrary/rdlibrary_nb.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1322,9 +1324,9 @@ Vil du sletta ho likevel? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Viss du slettar korga %06u, tømer du utklyppstavla. - Vil du halda fram? + Vil du halda fram? Empty Clipboard diff --git a/rdlibrary/rdlibrary_nn.ts b/rdlibrary/rdlibrary_nn.ts index b08dd339..4c502525 100644 --- a/rdlibrary/rdlibrary_nn.ts +++ b/rdlibrary/rdlibrary_nn.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1322,9 +1324,9 @@ Vil du sletta ho likevel? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Viss du slettar korga %06u, tømer du utklyppstavla. - Vil du halda fram? + Vil du halda fram? Empty Clipboard diff --git a/rdlibrary/rdlibrary_pt_BR.ts b/rdlibrary/rdlibrary_pt_BR.ts index 53006feb..3dcc47d8 100644 --- a/rdlibrary/rdlibrary_pt_BR.ts +++ b/rdlibrary/rdlibrary_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AudioCart @@ -1329,9 +1331,9 @@ Você ainda quer deletá-lo? Deleting cart %06u will also empty the clipboard. - Do you still want to proceed? + Do you still want to proceed? Deletar o Cartão %06u também esvaziará o clipboard. - Você ainda quer proceder? + Você ainda quer proceder? Empty Clipboard diff --git a/rdlogedit/rdlogedit_cs.ts b/rdlogedit/rdlogedit_cs.ts index 46fed4ba..94ee1918 100644 --- a/rdlogedit/rdlogedit_cs.ts +++ b/rdlogedit/rdlogedit_cs.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_de.ts b/rdlogedit/rdlogedit_de.ts index d7f819d3..cd257832 100644 --- a/rdlogedit/rdlogedit_de.ts +++ b/rdlogedit/rdlogedit_de.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_es.ts b/rdlogedit/rdlogedit_es.ts index 7c0f7c69..690510ce 100644 --- a/rdlogedit/rdlogedit_es.ts +++ b/rdlogedit/rdlogedit_es.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_fr.ts b/rdlogedit/rdlogedit_fr.ts index 04f9842d..f9e0f30a 100644 --- a/rdlogedit/rdlogedit_fr.ts +++ b/rdlogedit/rdlogedit_fr.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_nb.ts b/rdlogedit/rdlogedit_nb.ts index 3a4e12d2..f589ba37 100644 --- a/rdlogedit/rdlogedit_nb.ts +++ b/rdlogedit/rdlogedit_nb.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_nn.ts b/rdlogedit/rdlogedit_nn.ts index 3a4e12d2..f589ba37 100644 --- a/rdlogedit/rdlogedit_nn.ts +++ b/rdlogedit/rdlogedit_nn.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogedit/rdlogedit_pt_BR.ts b/rdlogedit/rdlogedit_pt_BR.ts index 75b3897e..0a5f7682 100644 --- a/rdlogedit/rdlogedit_pt_BR.ts +++ b/rdlogedit/rdlogedit_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddMeta diff --git a/rdlogin/rdlogin_cs.ts b/rdlogin/rdlogin_cs.ts index b81fcee4..92b4f578 100644 --- a/rdlogin/rdlogin_cs.ts +++ b/rdlogin/rdlogin_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_de.ts b/rdlogin/rdlogin_de.ts index 1df15bee..29ca2a8d 100644 --- a/rdlogin/rdlogin_de.ts +++ b/rdlogin/rdlogin_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_es.ts b/rdlogin/rdlogin_es.ts index 736b3dcf..466d2895 100644 --- a/rdlogin/rdlogin_es.ts +++ b/rdlogin/rdlogin_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_fr.ts b/rdlogin/rdlogin_fr.ts index 5f959f68..1181432d 100644 --- a/rdlogin/rdlogin_fr.ts +++ b/rdlogin/rdlogin_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_nb.ts b/rdlogin/rdlogin_nb.ts index 201c4075..8bf00007 100644 --- a/rdlogin/rdlogin_nb.ts +++ b/rdlogin/rdlogin_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_nn.ts b/rdlogin/rdlogin_nn.ts index 201c4075..8bf00007 100644 --- a/rdlogin/rdlogin_nn.ts +++ b/rdlogin/rdlogin_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogin/rdlogin_pt_BR.ts b/rdlogin/rdlogin_pt_BR.ts index 13180088..45fe7f94 100644 --- a/rdlogin/rdlogin_pt_BR.ts +++ b/rdlogin/rdlogin_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index e496c791..4498f32d 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index 242d11d0..b2d8f201 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index 1c501f8a..dfb625ca 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index e4b2dc3b..137a7f20 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index 08054280..9c279179 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index 08054280..9c279179 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index 5a10548e..704fccea 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -1,4 +1,6 @@ - + + + AddClock diff --git a/rdmonitor/rdmonitor_cs.ts b/rdmonitor/rdmonitor_cs.ts index c2ec30b8..d1ab435c 100644 --- a/rdmonitor/rdmonitor_cs.ts +++ b/rdmonitor/rdmonitor_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_de.ts b/rdmonitor/rdmonitor_de.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_de.ts +++ b/rdmonitor/rdmonitor_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_es.ts b/rdmonitor/rdmonitor_es.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_es.ts +++ b/rdmonitor/rdmonitor_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_fr.ts b/rdmonitor/rdmonitor_fr.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_fr.ts +++ b/rdmonitor/rdmonitor_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_nb.ts b/rdmonitor/rdmonitor_nb.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_nb.ts +++ b/rdmonitor/rdmonitor_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_nn.ts b/rdmonitor/rdmonitor_nn.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_nn.ts +++ b/rdmonitor/rdmonitor_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdmonitor/rdmonitor_pt_BR.ts b/rdmonitor/rdmonitor_pt_BR.ts index c916601b..f06331cb 100644 --- a/rdmonitor/rdmonitor_pt_BR.ts +++ b/rdmonitor/rdmonitor_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_cs.ts b/rdpanel/rdpanel_cs.ts index 1f664c4c..f64863ec 100644 --- a/rdpanel/rdpanel_cs.ts +++ b/rdpanel/rdpanel_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_de.ts b/rdpanel/rdpanel_de.ts index 08751cda..a448b767 100644 --- a/rdpanel/rdpanel_de.ts +++ b/rdpanel/rdpanel_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_es.ts b/rdpanel/rdpanel_es.ts index 0d3b3207..ff54b4f3 100644 --- a/rdpanel/rdpanel_es.ts +++ b/rdpanel/rdpanel_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_fr.ts b/rdpanel/rdpanel_fr.ts index 08751cda..a448b767 100644 --- a/rdpanel/rdpanel_fr.ts +++ b/rdpanel/rdpanel_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdpanel/rdpanel_pt_BR.ts b/rdpanel/rdpanel_pt_BR.ts index 08751cda..a448b767 100644 --- a/rdpanel/rdpanel_pt_BR.ts +++ b/rdpanel/rdpanel_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_cs.ts b/rdselect/rdselect_cs.ts index 0a7187f3..8ae07433 100644 --- a/rdselect/rdselect_cs.ts +++ b/rdselect/rdselect_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_de.ts b/rdselect/rdselect_de.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_de.ts +++ b/rdselect/rdselect_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_es.ts b/rdselect/rdselect_es.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_es.ts +++ b/rdselect/rdselect_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_fr.ts b/rdselect/rdselect_fr.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_fr.ts +++ b/rdselect/rdselect_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_nb.ts b/rdselect/rdselect_nb.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_nb.ts +++ b/rdselect/rdselect_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_nn.ts b/rdselect/rdselect_nn.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_nn.ts +++ b/rdselect/rdselect_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/rdselect/rdselect_pt_BR.ts b/rdselect/rdselect_pt_BR.ts index 37b41b2d..7f2a9f64 100644 --- a/rdselect/rdselect_pt_BR.ts +++ b/rdselect/rdselect_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/systemd/rivendell.service.in b/systemd/rivendell.service.in index 275f3c06..38cc131a 100644 --- a/systemd/rivendell.service.in +++ b/systemd/rivendell.service.in @@ -3,6 +3,7 @@ Description=Rivendell Radio Automation System After=network.target remote-fs.target nss-lookup.target [Service] +LimitNOFILE=4096 Type=simple ExecStart=@prefix@/sbin/rdservice PrivateTmp=false diff --git a/utils/rddgimport/rddgimport_de.ts b/utils/rddgimport/rddgimport_de.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_de.ts +++ b/utils/rddgimport/rddgimport_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_es.ts b/utils/rddgimport/rddgimport_es.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_es.ts +++ b/utils/rddgimport/rddgimport_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_fr.ts b/utils/rddgimport/rddgimport_fr.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_fr.ts +++ b/utils/rddgimport/rddgimport_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_nb.ts b/utils/rddgimport/rddgimport_nb.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_nb.ts +++ b/utils/rddgimport/rddgimport_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_nn.ts b/utils/rddgimport/rddgimport_nn.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_nn.ts +++ b/utils/rddgimport/rddgimport_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rddgimport/rddgimport_pt_BR.ts b/utils/rddgimport/rddgimport_pt_BR.ts index f9b0c2e3..70673dc7 100644 --- a/utils/rddgimport/rddgimport_pt_BR.ts +++ b/utils/rddgimport/rddgimport_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_cs.ts b/utils/rdgpimon/rdgpimon_cs.ts index 51fc85f6..8cb2e448 100644 --- a/utils/rdgpimon/rdgpimon_cs.ts +++ b/utils/rdgpimon/rdgpimon_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_de.ts b/utils/rdgpimon/rdgpimon_de.ts index 4a7dee00..63e13d1e 100644 --- a/utils/rdgpimon/rdgpimon_de.ts +++ b/utils/rdgpimon/rdgpimon_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_es.ts b/utils/rdgpimon/rdgpimon_es.ts index 2369f9f6..4d85e307 100644 --- a/utils/rdgpimon/rdgpimon_es.ts +++ b/utils/rdgpimon/rdgpimon_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_fr.ts b/utils/rdgpimon/rdgpimon_fr.ts index f322134d..5a3167c5 100644 --- a/utils/rdgpimon/rdgpimon_fr.ts +++ b/utils/rdgpimon/rdgpimon_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_nb.ts b/utils/rdgpimon/rdgpimon_nb.ts index 0a7961c9..252c1e39 100644 --- a/utils/rdgpimon/rdgpimon_nb.ts +++ b/utils/rdgpimon/rdgpimon_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_nn.ts b/utils/rdgpimon/rdgpimon_nn.ts index 0a7961c9..252c1e39 100644 --- a/utils/rdgpimon/rdgpimon_nn.ts +++ b/utils/rdgpimon/rdgpimon_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rdgpimon/rdgpimon_pt_BR.ts b/utils/rdgpimon/rdgpimon_pt_BR.ts index 51fc85f6..8cb2e448 100644 --- a/utils/rdgpimon/rdgpimon_pt_BR.ts +++ b/utils/rdgpimon/rdgpimon_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_cs.ts b/utils/rmlsend/rmlsend_cs.ts index c31a717b..ffe05b4a 100644 --- a/utils/rmlsend/rmlsend_cs.ts +++ b/utils/rmlsend/rmlsend_cs.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_de.ts b/utils/rmlsend/rmlsend_de.ts index 7818511b..1aa17488 100644 --- a/utils/rmlsend/rmlsend_de.ts +++ b/utils/rmlsend/rmlsend_de.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_es.ts b/utils/rmlsend/rmlsend_es.ts index b47db05e..e1810b6b 100644 --- a/utils/rmlsend/rmlsend_es.ts +++ b/utils/rmlsend/rmlsend_es.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_fr.ts b/utils/rmlsend/rmlsend_fr.ts index c31a717b..ffe05b4a 100644 --- a/utils/rmlsend/rmlsend_fr.ts +++ b/utils/rmlsend/rmlsend_fr.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_nb.ts b/utils/rmlsend/rmlsend_nb.ts index 372e15d4..87aeade7 100644 --- a/utils/rmlsend/rmlsend_nb.ts +++ b/utils/rmlsend/rmlsend_nb.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_nn.ts b/utils/rmlsend/rmlsend_nn.ts index 372e15d4..87aeade7 100644 --- a/utils/rmlsend/rmlsend_nn.ts +++ b/utils/rmlsend/rmlsend_nn.ts @@ -1,4 +1,6 @@ - + + + MainWidget diff --git a/utils/rmlsend/rmlsend_pt_BR.ts b/utils/rmlsend/rmlsend_pt_BR.ts index b63a24ec..d80b2c3b 100644 --- a/utils/rmlsend/rmlsend_pt_BR.ts +++ b/utils/rmlsend/rmlsend_pt_BR.ts @@ -1,4 +1,6 @@ - + + + MainWidget