Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-11 15:16:07 +01:00
Code Issues Projects Releases Wiki Activity

2014-09-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'lib/rdcut.cpp' that caused the 'Title' value
	to be applied to the 'Description' field in the 'RDCut::setMetadata()'
	method.
	* Added 'docs/metadata_wildcards.txt'.
	* Implemented support for the '%i' ['Cut Description'] wildcard in
	rdimport(1)'s '--metadata-pattern' switch in
	'utils/rdimport/rdimport.cpp' [Github Issue #6].
	* Implemented support for the '%o' ['Outcue'] wildcard in
	rdimport(1)'s '--metadata-pattern' switch in
	'utils/rdimport/rdimport.cpp'.
	* Implemented support for the '%y' ['Release Year'] wildcard in
	rdimport(1)'s '--metadata-pattern' switch in
	'utils/rdimport/rdimport.cpp'.
This commit is contained in:
Fred Gleason
2014-09-05 15:24:45 -04:00
parent f54385c881
commit cdba0ba578
20 changed files with 179 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
conf/rlm_facebook.conf
View File

@@ -32,27 +32,10 @@ Password=letmein
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=Now playing "%t" by "%a"
; Log Selection

53
conf/rlm_filewrite.conf
View File

@@ -29,57 +29,10 @@ Append=0
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; --------------------------------------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; \r \r Carriage Return (ASCII 13)
; \n \n Linefeed (ASCII 10)
; %d(<dt>) %D(<dt>) The start date/time, formatted according to <dt>. The
; following wildcards are available for <dt>:
; d - The day as a number without a leading zero (1 to 31).
; dd - The day as a number with a leading zero (01 to 31).
; ddd - The abbreviated localized day name ('Mon' or 'Sun').
; dddd - The long localized day name ('Monday' or 'Sunday').
; M - The month as a number without a leading zero
; (1 to 12).
; MM - The month as a number with a leading zero (01 to 12).
; MMM - The abbreviated localized month name ('Jan' or 'Dec').
; MMMM - The long localized month name ("January' or
; 'December').
; yy - The last two digits of the year.
; yyyy - The full four digits of the year.
; h - The hour without a leading zero (0 - 23, or 1 - 12
; if using AM/PM display).
; hh - The hour with a leading zero (00 - 23, or 01 -12 if
; using AM/PM display).
; m - The minute without a leading zero (0 - 59).
; mm - The minute with a leading zero (00 - 59).
; s - The second without a leading zero (00 - 60).
; ss - The second with a leading zero (00 - 60).
; z - The milliseconds without a leading zero (0 - 999).
; zzz - The milliseconds with leading zeros (000 - 999).
; AP - Use AM/PM display. The 'AP' will be replaced by
; 'AM' or 'PM' as appropriate.
; ap - Use AM/PM display. The 'ap' will be replaced by
; 'am' or 'pm' as appropriate.
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=NOW: %d(ddd MMM d hh:mm:ss yyyy): %t - %a\nNEXT: %D(ddd MMM d hh:mm:ss yyyy): %T - %A\n
; Encoding. Defines the set of escapes to be applied to the PAD fields.

23
conf/rlm_icecast2.conf
View File

@@ -45,27 +45,10 @@ Mountpoint=/audio.mp3
; Format String. The metadata to be sent each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=%t
; Log Selection

1
conf/rlm_padpoint.conf
View File

@@ -37,7 +37,6 @@ Aux2Log=Yes
; Additional UDP destinations can be configured by adding new sections...
;[Udp2]
;FormatString=Artist: %a%r
;IpAddress=192.168.10.22
;UdpPort=6789
;MasterLog=Yes

53
conf/rlm_serial.conf
View File

@@ -35,57 +35,10 @@ WordSize=8
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; --------------------------------------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; \r \r Carriage Return (ASCII 13)
; \n \n Linefeed (ASCII 10)
; %d(<dt>) %D(<dt>) The start date/time, formatted according to <dt>. The
; following wildcards are available for <dt>:
; d - The day as a number without a leading zero (1 to 31).
; dd - The day as a number with a leading zero (01 to 31).
; ddd - The abbreviated localized day name ('Mon' or 'Sun').
; dddd - The long localized day name ('Monday' or 'Sunday').
; M - The month as a number without a leading zero
; (1 to 12).
; MM - The month as a number with a leading zero (01 to 12).
; MMM - The abbreviated localized month name ('Jan' or 'Dec').
; MMMM - The long localized month name ("January' or
; 'December').
; yy - The last two digits of the year.
; yyyy - The full four digits of the year.
; h - The hour without a leading zero (0 - 23, or 1 - 12
; if using AM/PM display).
; hh - The hour with a leading zero (00 - 23, or 01 -12 if
; using AM/PM display).
; m - The minute without a leading zero (0 - 59).
; mm - The minute with a leading zero (00 - 59).
; s - The second without a leading zero (00 - 60).
; ss - The second with a leading zero (00 - 60).
; z - The milliseconds without a leading zero (0 - 999).
; zzz - The milliseconds with leading zeros (000 - 999).
; AP - Use AM/PM display. The 'AP' will be replaced by
; 'AM' or 'PM' as appropriate.
; ap - Use AM/PM display. The 'ap' will be replaced by
; 'am' or 'pm' as appropriate.
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=NOW: %d(ddd MMM d hh:mm:ss yyyy): %t - %a\nNEXT: %D(ddd MMM d hh:mm:ss yyyy): %T - %A\n
; Encoding. Defines the set of escapes to be applied to the PAD fields.

23
conf/rlm_shoutcast1.conf
View File

@@ -35,27 +35,10 @@ Tcpport=8000
; Format String. The metadata to be sent each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=%t
; Log Selection

23
conf/rlm_spottrap.conf
View File

@@ -52,27 +52,10 @@ UdpPort=5859
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=DX 1 %h!
; Default Format String. Similar to the 'FormatString=' parameter described

23
conf/rlm_twitter.conf
View File

@@ -32,27 +32,10 @@ Password=letmein
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=Now playing "%t" by "%a"
; Log Selection

53
conf/rlm_udp.conf
View File

@@ -26,57 +26,10 @@ UdpPort=1234
; Format String. The string to be output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; --------------------------------------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length (in milliseconds)
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; \r \r Carriage Return (ASCII 13)
; \n \n Linefeed (ASCII 10)
; %d(<dt>) %D(<dt>) The start date/time, formatted according to <dt>. The
; following wildcards are available for <dt>:
; d - The day as a number without a leading zero (1 to 31).
; dd - The day as a number with a leading zero (01 to 31).
; ddd - The abbreviated localized day name ('Mon' or 'Sun').
; dddd - The long localized day name ('Monday' or 'Sunday').
; M - The month as a number without a leading zero
; (1 to 12).
; MM - The month as a number with a leading zero (01 to 12).
; MMM - The abbreviated localized month name ('Jan' or 'Dec').
; MMMM - The long localized month name ("January' or
; 'December').
; yy - The last two digits of the year.
; yyyy - The full four digits of the year.
; h - The hour without a leading zero (0 - 23, or 1 - 12
; if using AM/PM display).
; hh - The hour with a leading zero (00 - 23, or 01 -12 if
; using AM/PM display).
; m - The minute without a leading zero (0 - 59).
; mm - The minute with a leading zero (00 - 59).
; s - The second without a leading zero (00 - 60).
; ss - The second with a leading zero (00 - 60).
; z - The milliseconds without a leading zero (0 - 999).
; zzz - The milliseconds with leading zeros (000 - 999).
; AP - Use AM/PM display. The 'AP' will be replaced by
; 'AM' or 'PM' as appropriate.
; ap - Use AM/PM display. The 'ap' will be replaced by
; 'am' or 'pm' as appropriate.
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString=NOW: %d(ddd MMM d hh:mm:ss yyyy): %t - %a\nNEXT: %D(ddd MMM d hh:mm:ss yyyy): %T - %A\n
; Encoding. Defines the set of escapes to be applied to the PAD fields.

23
conf/rlm_xmpad.conf
View File

@@ -40,27 +40,10 @@ ProgramID=1000000005
; Format Strings. There is one for each line of PAD data (total=2).
; The string is output each time RDAirPlay changes
; play state, including any wildcards as placeholders for metadata values.
; The following wildcards are available:
;
; Now Next Field
; ----------------------------------------------
; %n %N The Rivendell cart number
; %h %H Event length
; %g %G The Rivendell group name
; %t %T Title
; %a %A Artist
; %l %L Album
; %y %Y Year
; %b %B Record Label
; %c %C Client
; %e %E Agency
; %m %M Composer
; %p %P Publisher
; %r %R Conductor
; %s %S Song ID
; %u %U User Definied
; %o %O Outcue
; %i %I Description
; The list of available wildcards can be found in the 'metadata_wildcards.txt'
; file in the Rivendell documentation directory.
;
FormatString1=%c
FormatString2=%e