Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-07 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-29 16:01:37 -04:00
commit 0eeff3c7ac
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17896,6 +17896,7 @@
* Fixed a bug in 'configure.ac' that caused detection of FLAC * Fixed a bug in 'configure.ac' that caused detection of FLAC
support to always fail. support to always fail.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
2018-10-24 Fred Gleason <fredg@paravelsystems.com> 2018-10-24 Fred Gleason <fredg@paravelsystems.com>
* Consolidated the implementation of the 'RDProfile' class into * Consolidated the implementation of the 'RDProfile' class into
two files. two files.
@ -17944,3 +17945,5 @@
2018-10-29 Patrick Linstruth <patrick@deltecent.com> 2018-10-29 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression where background colors are were not displayed * Fixed regression where background colors are were not displayed
in the RDDatePicker calendar. in the RDDatePicker calendar.
2018-10-29 Patrick Linstruth <patrick@deltecent.com>
* Updated the 'README' file with RDDbConfig utility.

4
INSTALL
View File

@ -224,13 +224,13 @@ In the '[mySQL]' section of the '/etc/rd.conf' file, set the 'Database=',
'Loginname=' and 'Password=' parameters to the DB name, user and password 'Loginname=' and 'Password=' parameters to the DB name, user and password
that you created. Then, create an initial Rivendell database by doing: that you created. Then, create an initial Rivendell database by doing:
rddbmgr --create rddbmgr --create
If all goes well, this command should return with no output. If all goes well, this command should return with no output.
Finally, start up the Rivendell service by doing (as root): Finally, start up the Rivendell service by doing (as root):
systemctl start rivendell systemctl start rivendell
You should now be able to run the various Rivendell components from the You should now be able to run the various Rivendell components from the
Applications menu. Applications menu.

7
README
View File

@ -57,12 +57,13 @@ A utility for posting and managing podcast episodes.
RDGpiMon RDGpiMon
A utility for monitoring GPI line status. A utility for monitoring GPI line status.
RDHPIInfo
A utility for configuring AudioScience audio adapters.
RDAlsaConfig RDAlsaConfig
A utility for configuring ALSA audio adapters. A utility for configuring ALSA audio adapters.
RDDbConfig
A utility for creating, backing up and restoring the Rivendell
database.
RDImport RDImport
A command-line utility for batch importing audio along with A command-line utility for batch importing audio along with
accompanying metadata. Do: accompanying metadata. Do: