diff --git a/lang/template.json b/lang/template.json
index 823a22f..968b509 100644
--- a/lang/template.json
+++ b/lang/template.json
@@ -3,6 +3,7 @@
" OK ": "",
" OK ": "",
"\"Fit each screen\" keeps the layout you see on a 1920×1080 screen, so moving the window to a laptop or a 1440p or 4K screen shows the same amount of everything. \"Same size in pixels\" ignores the display scaling set in Windows.": "",
+ "(all day)": "",
"(chosen files are used instead of the folder)": "",
"(deleted rule)": "",
"(not connected)": "",
@@ -10,6 +11,9 @@
"12-band": "",
"16 bands at most": "",
"A DovaFM Digital Entertainment Group brand. Free and open source under the MIT licence.": "",
+ "A copy of this event to change": "",
+ "A copy of this template to change": "",
+ "A different pattern for part of the day. The first one that covers the time is used; outside them the pattern above is.": "",
"A newer RadioMaster is on GitHub — click to see what's new and install it": "",
"A plugin controls RadioMaster by printing lines such as RM: VOLUME 60 or RM: PLAYLIST Evening.": "",
"AAC (ffmpeg)": "",
@@ -70,6 +74,7 @@
"Also appended to history.csv in the RadioMaster data folder.": "",
"Also the same song in different files": "",
"Another folder to look for moved files in (besides the library folders)": "",
+ "Another running order from the same template": "",
"Appearance / workzones": "",
"Append to playlist": "",
"Applies configuration changes; listeners are briefly disconnected": "",
@@ -80,6 +85,7 @@
"Artist separation": "",
"Assign audio file…": "",
"At": "",
+ "At the top of every hour": "",
"Attack": "",
"Audio FX": "",
"Audio devices": "",
@@ -144,6 +150,7 @@
"Connect to Remote Server…": "",
"Connect to Server…": "",
"Connect without saving": "",
+ "Connected to a server: Generate makes a new running order there.": "",
"Connection": "",
"Content type": "",
"Copies host + server type into the first encoder": "",
@@ -200,9 +207,11 @@
"Events": "",
"Every": "",
"Every 30 minutes on the clock = at :00 and :30. Off = 30 minutes after the last time.": "",
+ "Every 60 minutes on the clock = at the top of each hour. Off = counted from the start of the playlist.": "",
"Every change is listed in cleanup-log.csv in the data folder.": "",
"Every day": "",
"Every file is there and can be read.": "",
+ "Every hour on the hour, after the song that's playing": "",
"Every play (CSV / Excel)…": "",
"Every track overlaps the next by this much. Tracks with cues set in the track editor still use their own.": "",
"Everything": "",
@@ -273,12 +282,14 @@
"Input": "",
"Input (microphone / line in)": "",
"Insert": "",
+ "Insert a playlist item (time announcement, speech, stream…)": "",
"Insert after selected row": "",
"Insert as next": "",
"Insert file as next": "",
"Insert playlist": "",
"Insert tracks from playlist…": "",
"Insert voice track…": "",
+ "Inserts": "",
"Install now": "",
"Interface size": "",
"Intro sound": "",
@@ -287,7 +298,7 @@
"JINGLE": "",
"Jingles": "",
"Jingles & adverts (their rule's files)": "",
- "Jingles, adverts and other inserts by time (counted along the generated running order):": "",
+ "Jingles, adverts, talk or a time announcement, like the advert / jingle rules: after a number of songs, every so often, or at set times. Timed ones go in after the song that's playing when the time comes.": "",
"Keep": "",
"Keep the music at full level": "",
"Keep the playing track near the top as songs finish (the last one played stays in view)": "",
@@ -305,6 +316,7 @@
"Leave out": "",
"Leave these empty to keep the password. At least 12 characters.": "",
"Length": "",
+ "Length and separation": "",
"Level the track to a common loudness": "",
"Library": "",
"Library cleanup": "",
@@ -425,7 +437,7 @@
"Parametric": "",
"Password": "",
"Password (12+ characters for setup)": "",
- "Pattern (repeats until the length is reached):": "",
+ "Pattern": "",
"Pause": "",
"Pause the music, carry on after": "",
"Performance": "",
@@ -469,6 +481,7 @@
"Presenter notes are local text; they are not automatically broadcast.": "",
"Presets…": "",
"Press a key… (Esc cancels)": "",
+ "Preview": "",
"Preview (track editor)": "",
"Previous": "",
"Profile:": "",
@@ -507,11 +520,14 @@
"Remove the selected rows": "",
"Remove this MIDI control": "",
"Remove this key": "",
+ "Remove this step": "",
"Remove this time": "",
"Removed files:": "",
"Removing files": "",
"Render playlist to WAV…": "",
"Reorder, or drop on another playlist's tab to move them there": "",
+ "Repeat every": "",
+ "Repeats until the length is reached:": "",
"Report": "",
"Report (CSV / Excel)…": "",
"Reports": "",
@@ -556,6 +572,7 @@
"Seconds of each": "",
"Security": "",
"Security and web portal": "",
+ "See the running order first; nothing changes until you use it": "",
"Select a track in the playlist, then:": "",
"Select all": "",
"Select none": "",
@@ -571,6 +588,7 @@
"Set to the playhead / cursor position": "",
"Set volume (0-1)": "",
"Settings": "",
+ "Several genres: separate them with commas (Rock, Pop)": "",
"Shared by every song by this artist": "",
"Shortcuts and MIDI": "",
"Shortcuts and MIDI…": "",
@@ -594,6 +612,7 @@
"Song": "",
"Song Requests": "",
"Song requests come from AzuraCast. Set it up in Tools → AzuraCast → Connection.": "",
+ "Song separation": "",
"Songs": "",
"Sort by": "",
"Sound card buffer": "",
@@ -647,8 +666,9 @@
"The queue is empty.": "",
"The server has no sound cards.": "",
"The server was started with --no-audio, so it streams only until it is started without it.": "",
+ "The template's times of day and timed inserts follow the clock from where the new tracks start.": "",
"These belong to the server itself. Station settings (playlists, streams, adverts…) are in the usual places while you're connected.": "",
- "Things that happen at a set time: a new playlist from a template, adverts, a playlist going on air, encoders, volume…": "",
+ "Things that happen at a set time, or again and again: a time announcement or any other playlist item, a new playlist from a template, adverts, a playlist going on air, encoders, volume…": "",
"This copy wasn't installed with the setup program, so download the new zip (or the installer) from the page.": "",
"This is what the stream hears. Outputs marked Studio monitor are always muted while the mic is on.": "",
"This page needs an AzuraCast API key.": "",
@@ -656,7 +676,9 @@
"Threshold": "",
"Tick every device that should play the on-air mix. The first working device is the primary; the others get a copy (monitor / headphones / second sound card). Each has its own volume.": "",
"Time": "",
+ "Time announcement": "",
"Time until the next hour marker in the playlist": "",
+ "Times of day": "",
"Tip: create a Streamer/DJ account in AzuraCast, then use the “AzuraCast DJ preset” on the Streaming tab.": "",
"Title": "",
"Today": "",
@@ -666,6 +688,7 @@
"Track List Repeat Protection…": "",
"Track Title": "",
"Track editor": "",
+ "Tracks whose artist, title, genre or file name has one of these words are left out": "",
"Transitions": "",
"Translate RadioMaster: export the template, fill in the right-hand side of each line, save it as e.g. Deutsch.json in the lang folder, then pick it here. Share it on GitHub so everyone gets it.": "",
"Trim silence": "",
@@ -740,6 +763,9 @@
"a folder or chosen files": "",
"advert": "",
"adverts": "",
+ "after every": "",
+ "after the playlist (instead of replacing it)": "",
+ "after the track on air": "",
"all day": "",
"all files in order": "",
"all of them": "",
@@ -779,7 +805,6 @@
"https://radio.example.com/live.mp3": "",
"id:secret (for skip/upload)": "",
"identical files": "",
- "insert": "",
"is lowered (set how far with the slider next to the Mic volume)": "",
"is muted (it keeps playing silently)": "",
"is paused, and carries on when the mic goes off": "",
@@ -791,6 +816,7 @@
"keeping": "",
"keeps playing at full level": "",
"last:": "",
+ "leave out": "",
"length": "",
"library": "",
"lower ↔ higher": "",
@@ -806,6 +832,7 @@
"none": "",
"not found (only needed for formats other than MP3)": "",
"not on air": "",
+ "now (the track on air moves on)": "",
"of each track (0 = off)": "",
"off": "",
"on air": "",
@@ -817,6 +844,7 @@
"password (12+ characters)": "",
"pause": "",
"pick a rule": "",
+ "pick an item": "",
"playlist row(s)": "",
"playlist rows removed": "",
"plays": "",
@@ -834,15 +862,19 @@
"target": "",
"text in the title": "",
"the Adverts list — each advert only in its own dates and days": "",
+ "the next time the clock reaches it": "",
"the same artist played in the last": "",
+ "the same song doesn't come back sooner": "",
"the same track played in the last": "",
"this advert": "",
"this band": "",
"this category": "",
"this event": "",
+ "this insert": "",
"this rule": "",
"this shortcut": "",
"this template": "",
+ "this time of day": "",
"this web panel": "",
"to": "",
"tools": "",
@@ -858,6 +890,8 @@
"voices on this computer": "",
"wait (silence) until the time": "",
"when under": "",
+ "words, e.g. live, remix": "",
+ "years": "",
"yes": "",
"{}": "",
"…or choose files": "",
@@ -908,6 +942,7 @@
"✏ Track editor…": "",
"✔ = cues set by hand": "",
"✔ Do it": "",
+ "✔ Put it in the playlist": "",
"✔ RadioMaster is up to date.": "",
"✖ Close": "",
"✖ not found — needed for AAC, Opus, Vorbis and FLAC streams": "",
@@ -924,11 +959,15 @@
"➕ Add pattern step": "",
"➕ Add streamer": "",
"➕ Add time": "",
+ "➕ Add time announcement": "",
+ "➕ Add time of day": "",
"➕ Advert rule": "",
"➕ Folder…": "",
+ "➕ Hourly time announcement": "",
"➕ Jingle rule": "",
"➕ New": "",
"➕ Playlist": "",
+ "⟳ Again": "",
"⟳ Refresh": "",
"⟳ Refresh devices": "",
"⟳ Reload plugins": "",
@@ -944,6 +983,7 @@
"🎤 Streamers/DJs": "",
"🎲 Playlist Generator Pro…": "",
"🏷 Genres": "",
+ "👁 Preview": "",
"👥 Listeners": "",
"👯 Duplicates": "",
"💾 Save as M3U…": "",
diff --git a/site/guides/event-scheduler/index.html b/site/guides/event-scheduler/index.html
index 1f2ae33..c79416b 100644
--- a/site/guides/event-scheduler/index.html
+++ b/site/guides/event-scheduler/index.html
@@ -113,8 +113,8 @@
Guide · Run the station
How to automate with the event scheduler
-
The event scheduler does things at set times so you don't have to be there: make a fresh playlist every morning, put Friday night's show on air at 19:00, start the second stream for a sports match, or run any station command.
-
+
The event scheduler does things at set times so you don't have to be there: make a fresh playlist every morning, put Friday night's show on air at 19:00, read the time every hour, start the second stream for a sports match, or run any station command.
+
@@ -128,10 +128,24 @@
Add an event
Choose what to Do (the actions are below) and fill in what it needs, such as a template, a playlist tab or a rule.
Press ▶ Run now to try it straight away.
-
Each event has its own on/off tick, so you can park one without deleting it.
+
Each event has its own on/off tick, so you can park one without deleting it, and Duplicate makes a copy to change.
+
+
Repeat an event
+
Tick Repeat every to run an event again and again: choose minutes or hours and the time it stops. The event's time becomes the first run. For example, from 06:00, repeat every 30 minutes until 22:00 runs at 06:00, 06:30, 07:00 … 22:00. A stop time earlier than the start runs over midnight (22:00 until 02:00).
+
➕ Hourly time announcement adds a ready-made event that reads the time at the top of every hour, every day.
Switches to another playlist tab, for example a show you prepared earlier
Play the on-air playlist again from the top
Restarts the on-air playlist, which keeps a playlist looping
Load playlist (M3U) and play
Opens an M3U file and plays it
Play file now
Plays one file straight away
Insert file as next
Puts a file after the song on air
Stop playback
Stops the station
Start encoder # / Stop encoder #
Starts or stops one of your streams, counting from 1 like the Streams tab
Set volume (0-1)
Sets the master volume, 1 being full
Run a station command
Any command below
+
+
Insert a playlist item
+
Pick Insert a playlist item, then choose the item from the list next to it. These are the same items as in the Playlist menu, set up in the same dialogs:
+
+
Time announcement: reads the current time
+
Text to speech: any text in a computer voice, with {time}, {next} and the other fill-ins, for example "You're listening to Radio X, it's {time}"
+
Track List: one random track from a folder, with repeat protection, which suits station IDs
+
Container, URL (an internet stream), Line Input, Teaser, Timed pause and Command
+
+
Use ✏ Edit… to change it later. Choose whether it plays after the track on air (the song isn't cut) or now. If the last one is still waiting to play, for example while playback is stopped, another copy isn't added.
Station commands
The same commands work in an event, in a playlist Command row (Alt+C) and from a plugin.
@@ -144,8 +158,10 @@
Recipes
A sponsored news intro: 07:59, weekdays, Play adverts / jingles from a rule → News sponsor.
A second stream for a match: Saturday 14:45, Run a station command → ENCODER START 2, and 17:15, ENCODER STOP 2.
Quieter overnight: 00:00, Set volume 0.8; 06:00, Set volume 1.
+
The time every hour: ➕ Hourly time announcement, or from 00:00 repeat every 1 hour, Insert a playlist item → Time announcement.
+
A spoken station ID every half hour in the daytime: from 06:30, repeat every 30 minutes until 22:00, Insert a playlist item → Text to speech.
-
Something every hour? An event runs at one time of day. For a station ID or a top-of-the-hour jingle every hour, make a jingle rule that plays every 1 hour on the clock in the advertisement scheduler, or an insert in your generator template.
+
Jingles on the clock? For jingles and adverts with play counts and reports, use a rule that plays every 1 hour on the clock in the advertisement scheduler, or an insert in your generator template.
Events in the playlist
Playlist → Add event puts an Event row in the running order. When playback reaches it, it runs a scheduler action, for example ending a show's playlist with "Put a playlist tab on air → Main" so Main carries on where it left off instead of dead air.
The playlist generator builds hours of programming from your music library in one click. You tell it what pools of songs you have (categories) and how an hour should sound (a template), and it fills the playlist, keeps artists apart and drops in jingles and hour markers for you.
-
+
The playlist generator builds hours of programming from your music library in one click. You tell it what pools of songs you have (categories) and how an hour should sound (a template), and it fills the playlist, keeps artists and songs apart, changes the sound for different times of day and drops in jingles, talk and time announcements on the clock.
+
@@ -124,8 +124,8 @@
Before you start
Can't open it? The playlist generator is a tool an administrator can allow or block per user. See users and permissions.
1. Make your categories
-
A category is a pool of tracks the generator can pick from. Each one has a name and up to three filters; leave a filter empty to mean "any".
-
Filter
What it matches
folder
Tracks whose file is inside this folder (or any folder in it). Use … to pick it.
genre
Tracks whose genre tag contains this text, ignoring capitals. rock matches Rock, Soft Rock and Rock & Roll.
length
Shortest and longest track in seconds. A maximum of 0 means no limit. Handy for keeping long album versions or short IDs out.
+
A category is a pool of tracks the generator can pick from. Each one has a name and some filters; leave a filter empty to mean "any".
+
Filter
What it matches
folder
Tracks whose file is inside this folder (or any folder in it). Use … to pick it.
genre
Tracks whose genre tag contains this text, ignoring capitals. rock matches Rock, Soft Rock and Rock & Roll. Separate several with commas: rock, pop takes either.
length
Shortest and longest track in seconds. A maximum of 0 means no limit. Handy for keeping long album versions or short IDs out.
years
The year tag, from and to (any = no limit). 1980 – 1989 makes an 80s category.
leave out
Words, separated by commas, that keep a track out when its artist, title, genre or file name has one of them, for example live, remix, instrumental.
A typical music station might have:
Category
Filters
Current
folder D:\Music\Current
Recurrent
folder D:\Music\Recurrent
Gold
folder D:\Music\Gold, length 120–420 s
Station IDs
folder D:\Jingles\IDs, length 0–30 s
Press ➕ Add category for each one. The delete button asks Delete! / Keep first, so a stray click won't lose anything.
@@ -134,20 +134,29 @@
2. Write a template
A template describes how the programming should sound. Press ➕ New under Templates, then set:
Name: what you'll pick it by, for example Daytime or Overnight.
-
Length: how much to make, from 5 minutes to 24 hours (1440 minutes).
+
Length: how much to make, from 5 minutes to 24 hours (1440 minutes), or until a time of day, such as until 22:00, the next time the clock gets there.
Artist separation: how many tracks must pass before the same artist can play again. 8 to 12 suits most music stations.
+
Song separation: how many minutes before the same song can come back. Off means a song can return once its category has been played through.
The pattern
The pattern is the running order the generator repeats until the length is reached. Each step is a count and a source: a category, or the files of one of your advert or jingle rules. Press ➕ Add pattern step for each step. For example:
Step
Count
From
1.
2 ×
Current
2.
1 ×
Gold
3.
1 ×
Recurrent
4.
1 ×
Station IDs
That gives Current, Current, Gold, Recurrent, ID, then round again.
-
Inserts by time
-
Below the pattern you can add things that go in by time instead of by position, such as "every 15 min insert 1 × Station IDs". Press ➕ Add insert, then set the minutes, the count and the source. ➕ Add jingles is a shortcut that adds your first jingle rule every 15 minutes.
-
Times are counted along the generated running order using each track's length, so an insert every 30 minutes lands roughly every half hour of airtime wherever the playlist starts.
+
3. Times of day
+
A station rarely sounds the same all day. Under Times of day, press ➕ Add time of day to give some hours their own pattern: pick the hours (from 06:00 to 10:00, for example), the days, and the steps. The first time of day that covers the clock is used, and outside them the main pattern is. 22:00 to 06:00 runs over midnight.
+
Time of day
Hours and days
Pattern
Breakfast
06:00–10:00, Mon–Fri
1 × Talk, 2 × Current
Overnight
00:00–06:00, every day
3 × Gold, 1 × Station IDs
+
The clock follows the new tracks from where they will start on air, so a template that runs from 05:00 switches to the breakfast pattern at about 06:00.
+
+
4. Inserts
+
Inserts are things that go in on their own schedule instead of by position in the pattern, set up like advert and jingle rules. Press ➕ Add insert, pick what to insert and how many, then when:
+
When
Example
after every N songs
1 × Station IDs after every 4 songs
every N minutes
A jingle every 15 minutes. Tick on the clock to count from the top of the hour, so every 60 minutes means at :00.
at set times
1 × Talk at 18:00 and 20:30
+
Each insert can be limited to some hours (untick all day). An insert can come from a category, from the files of an advert or jingle rule, or be a ⏰ Time announcement: ➕ Add time announcement adds one at the top of every hour. ➕ Add jingles is a shortcut that adds your first jingle rule every 15 minutes.
+
Timed inserts go in after the song that's playing when the time comes, so songs are never cut.
Hour markers
Tick Hour marker at the top of every hour and the generator places an hour marker where each new hour starts, so the station stays on the clock even if the songs run long or short.
-
3. Generate
+
5. Preview and generate
+
👁 Preview shows the running order with the time each row starts, the number of tracks and the total length, without touching the playlist. Press ⟳ Again for another mix, tick after the playlist to see it as an addition, and ✔ Put it in the playlist when you like it. Or go straight to:
▶ Generate (replace playlist) clears the playlist and fills it with the template.
Append to playlist adds the new tracks after the last row, keeping what's already there.
@@ -167,7 +176,7 @@
Tips
Within one generated playlist, every track in a category plays once before any of them repeats, so big categories stay fresh.
If artist separation can't be met (a small category with few artists), the generator still picks a track rather than leaving a gap.
Timed inserts (jingles, IDs, adverts) don't count towards artist separation.
-
Make a template per daypart (Breakfast, Daytime, Evening, Overnight) and switch between them with the event scheduler.
+
Times of day let one template cover a whole day. For very different shows you can still make a template each and switch between them with the event scheduler.
While connected to RadioMaster Server, the library and folders are the server's, so a category folder is typed the way the server sees it, for example /srv/music/current.
diff --git a/src/app.rs b/src/app.rs
index d7a4794..a287aa4 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,6 +1,6 @@
use crate::azuracast::Client;
use crate::browser::Browsers;
-use crate::config::{data_dir, CartPad, Category, Marker, PatternItem, ServerKind, Template};
+use crate::config::{data_dir, CartPad, ServerKind};
use crate::i18n::tr;
use crate::items::PlEntry;
use crate::library::Track;
@@ -151,6 +151,8 @@ mod cleanupui;
mod controlsui;
#[path = "equi.rs"]
mod equi;
+#[path = "genui.rs"]
+mod genui;
#[path = "panes.rs"]
mod panes;
#[path = "pltools.rs"]
@@ -232,6 +234,7 @@ pub struct App {
/// playback was paused by the mic (Pause mode) and resumes when it goes off
mic_paused: bool,
tpl_sel: usize,
+ gen: genui::GenUi,
rep: reportui::RepUi,
/// where ffmpeg was found (None = look again)
ffmpeg_found: Option>,
@@ -399,6 +402,8 @@ pub(super) struct ActionOpts {
pub rules: Vec<(u64, String)>,
pub tabs: Vec,
pub n_enc: usize,
+ /// offer "Insert a playlist item" (scheduler events; playlist event rows can't hold one)
+ pub items: bool,
}
impl ActionOpts {
@@ -408,6 +413,7 @@ impl ActionOpts {
rules: core.cfg.ad_rules.iter().map(|r| (r.id, r.name.clone())).collect(),
tabs: core.tabs.iter().map(|t| t.name.clone()).collect(),
n_enc: core.cfg.encoders.len(),
+ items: false,
}
}
}
@@ -425,7 +431,9 @@ pub(super) fn action_edit(
let mut browse = false;
egui::ComboBox::from_id_salt(("act", id)).selected_text(tr(action.label())).width(290.0).height(400.0).show_ui(ui, |ui| {
for a in ActionKind::ALL {
- ui.selectable_value(action, a, tr(a.label()));
+ if a != ActionKind::InsertItem || o.items {
+ ui.selectable_value(action, a, tr(a.label()));
+ }
}
});
if action.needs_template() {
@@ -474,10 +482,12 @@ pub(super) fn action_file_dialog(action: ActionKind) -> rfd::FileDialog {
}
/// Where generator tracks come from: a category, or the files of an advert / jingle rule
-/// (stored as "rule:"). `rules` = (id, name, adverts).
-fn source_combo(ui: &mut egui::Ui, id: impl std::hash::Hash, cur: &mut String, cats: &[String], rules: &[(u64, String, bool)]) {
+/// (stored as "rule:"). `rules` = (id, name, adverts). `time` also offers a time announcement
+/// (for inserts).
+fn source_combo(ui: &mut egui::Ui, id: impl std::hash::Hash, cur: &mut String, cats: &[String], rules: &[(u64, String, bool)], time: bool) {
let shown = match cur.strip_prefix("rule:").and_then(|s| s.parse::().ok()) {
Some(rid) => rules.iter().find(|r| r.0 == rid).map(|r| format!("⚡ {}", r.1)).unwrap_or_else(|| tr("(deleted rule)").to_string()),
+ None if cur == crate::generator::TIME_SOURCE => format!("⏰ {}", tr("Time announcement")),
None => cur.clone(),
};
egui::ComboBox::from_id_salt(id).selected_text(shown).width(170.0).show_ui(ui, |ui| {
@@ -493,6 +503,10 @@ fn source_combo(ui: &mut egui::Ui, id: impl std::hash::Hash, cur: &mut String, c
ui.selectable_value(cur, format!("rule:{rid}"), format!("⚡ {name} ({tag})"));
}
}
+ if time {
+ ui.separator();
+ ui.selectable_value(cur, crate::generator::TIME_SOURCE.to_string(), format!("⏰ {}", tr("Time announcement")));
+ }
});
}
@@ -574,6 +588,7 @@ impl App {
mic_on: false,
mic_paused: false,
tpl_sel: 0,
+ gen: Default::default(),
rep: Default::default(),
ffmpeg_found: None,
ads: Default::default(),
@@ -2400,13 +2415,25 @@ impl App {
}
fn tab_scheduler(&mut self, ui: &mut egui::Ui, core: &mut Playout) {
- ui.horizontal(|ui| {
+ ui.horizontal_wrapped(|ui| {
if ui.button(tr("➕ Add event")).clicked() {
core.cfg.events.push(Event::default());
}
+ if ui.button(tr("➕ Hourly time announcement")).on_hover_text(tr("Every hour on the hour, after the song that's playing")).clicked() {
+ core.cfg.events.push(Event {
+ name: tr("Time announcement").to_string(),
+ hour: 0,
+ minute: 0,
+ repeat_mins: 60,
+ until: (23, 59),
+ action: ActionKind::InsertItem,
+ item: Some(crate::items::PlEntry::special(crate::items::ItemKind::TimeAnnounce, "", 4.0)),
+ ..Default::default()
+ });
+ }
ui.label(
RichText::new(tr(
- "Things that happen at a set time: a new playlist from a template, adverts, a playlist going on air, encoders, volume…",
+ "Things that happen at a set time, or again and again: a time announcement or any other playlist item, a new playlist from a template, adverts, a playlist going on air, encoders, volume…",
))
.small()
.color(GRAY),
@@ -2415,7 +2442,10 @@ impl App {
ui.add_space(4.0);
let mut del = None;
let mut run_now = None;
- let opts = ActionOpts::of(core);
+ let mut dup = None;
+ let mut item_edit: Option<(usize, Option)> = None;
+ let mut opts = ActionOpts::of(core);
+ opts.items = true;
let now = core.now();
egui::ScrollArea::vertical().show(ui, |ui| {
if core.cfg.events.is_empty() {
@@ -2428,27 +2458,56 @@ impl App {
ui.horizontal_wrapped(|ui| {
ui.checkbox(&mut e.enabled, "");
ui.add(egui::TextEdit::singleline(&mut e.name).desired_width(170.0));
- ui.label(tr("at"));
+ ui.label(if e.repeat_mins == 0 { tr("at") } else { tr("from") });
ui.add(egui::DragValue::new(&mut e.hour).range(0..=23).custom_formatter(|v, _| format!("{:02}", v as u32)));
ui.label(":");
ui.add(egui::DragValue::new(&mut e.minute).range(0..=59).custom_formatter(|v, _| format!("{:02}", v as u32)));
if ui.button(tr("▶ Run now")).on_hover_text(tr("Do it now, as a test")).clicked() {
run_now = Some(i);
}
+ if ui.button(tr("Duplicate")).on_hover_text(tr("A copy of this event to change")).clicked() {
+ dup = Some(i);
+ }
if delete_button(ui, ("event", i), tr("this event")) {
del = Some(i);
}
});
+ ui.horizontal_wrapped(|ui| {
+ let mut repeat = e.repeat_mins > 0;
+ if ui.checkbox(&mut repeat, tr("Repeat every")).changed() {
+ e.repeat_mins = if repeat { 60 } else { 0 };
+ }
+ if repeat {
+ let hours = e.repeat_mins.is_multiple_of(60);
+ if hours {
+ let mut h = (e.repeat_mins / 60).max(1);
+ if ui.add(egui::DragValue::new(&mut h).range(1..=23)).changed() {
+ e.repeat_mins = h * 60;
+ }
+ } else {
+ ui.add(egui::DragValue::new(&mut e.repeat_mins).range(1..=1439));
+ }
+ let mut unit_hours = hours;
+ if ui.selectable_value(&mut unit_hours, false, tr("minutes")).clicked() && hours {
+ e.repeat_mins = 30;
+ }
+ if ui.selectable_value(&mut unit_hours, true, tr("hours")).clicked() && !hours {
+ e.repeat_mins = 60;
+ }
+ ui.label(tr("until"));
+ ui.add(egui::DragValue::new(&mut e.until.0).range(0..=23).custom_formatter(|v, _| format!("{:02}", v as u32)));
+ ui.label(":");
+ ui.add(egui::DragValue::new(&mut e.until.1).range(0..=59).custom_formatter(|v, _| format!("{:02}", v as u32)));
+ ui.label(RichText::new(e.when_text()).small().color(GRAY));
+ }
+ });
adsui::days_edit(ui, &mut e.days);
ui.horizontal_wrapped(|ui| {
ui.label(tr("Dates"));
date_edit(ui, ("ev_from", i), &mut e.from_date, true);
ui.label(tr("to"));
date_edit(ui, ("ev_to", i), &mut e.to_date, true);
- let mut probe = e.clone();
- probe.hour = now.hour();
- probe.minute = now.minute();
- if e.enabled && !probe.due(&now) {
+ if e.enabled && !e.on_day(&now) {
ui.label(RichText::new(tr("○ not today")).small().color(AMBER));
}
});
@@ -2458,14 +2517,50 @@ impl App {
let a = e.action;
self.dlg(move || action_file_dialog(a).pick_file().map(|p| Dlg::SchedPath(i, p)));
}
+ if e.action == ActionKind::InsertItem {
+ let shown = match &e.item {
+ Some(it) if it.title().contains(tr(it.type_label())) => it.title(),
+ Some(it) => format!("{} · {}", tr(it.type_label()), it.title()),
+ None => tr("pick an item").to_string(),
+ };
+ egui::ComboBox::from_id_salt(("ev_item", i)).selected_text(shown).width(240.0).height(400.0).show_ui(
+ ui,
+ |ui| {
+ for (k, label) in pltools::EVENT_ITEMS {
+ if ui.selectable_label(false, tr(label)).clicked() {
+ item_edit = Some((i, Some(k)));
+ }
+ }
+ },
+ );
+ if e.item.as_ref().is_some_and(|it| !matches!(it.kind, crate::items::ItemKind::TimeAnnounce))
+ && ui.button(tr("✏ Edit…")).clicked()
+ {
+ item_edit = Some((i, None));
+ }
+ }
});
+ if e.action == ActionKind::InsertItem {
+ ui.horizontal_wrapped(|ui| {
+ ui.radio_value(&mut e.play_now, false, tr("after the track on air"));
+ ui.radio_value(&mut e.play_now, true, tr("now (the track on air moves on)"));
+ });
+ }
});
}
});
+ if let Some((i, kind)) = item_edit {
+ self.edit_event_item(core, i, kind);
+ }
if let Some(i) = run_now {
let e = core.cfg.events[i].clone();
core.run_event(&e);
}
+ if let Some(i) = dup {
+ let mut e = core.cfg.events[i].clone();
+ e.name = format!("{} (copy)", e.name);
+ core.cfg.events.push(e);
+ }
if let Some(i) = del {
core.cfg.events.remove(i);
}
@@ -2988,151 +3083,6 @@ impl App {
});
}
- fn tab_generator(&mut self, ui: &mut egui::Ui, core: &mut Playout) {
- let cat_names: Vec = core.cfg.categories.iter().map(|c| c.name.clone()).collect();
- let tpl_names: Vec = core.cfg.templates.iter().map(|t| t.name.clone()).collect();
- let rules: Vec<(u64, String, bool)> = core.cfg.ad_rules.iter().map(|r| (r.id, r.name.clone(), r.adverts)).collect();
- let first_jingle = rules.iter().find(|r| !r.2).map(|r| format!("rule:{}", r.0));
- let mut gen: Option<(String, bool)> = None;
- egui::ScrollArea::vertical().show(ui, |ui| {
- ui.strong(tr("Auto-playlist"));
- ui.horizontal(|ui| {
- ui.checkbox(&mut core.cfg.auto_enabled, tr("Keep the playlist filled automatically"));
- ui.label(tr("using"));
- name_combo(ui, "autotpl", &mut core.cfg.auto_template, &tpl_names);
- ui.label(tr("when under"));
- ui.add(egui::DragValue::new(&mut core.cfg.auto_min_mins).range(1..=600).suffix(" min left"));
- });
- ui.separator();
- ui.strong(tr("Categories (what each pool of tracks is made from)"));
- let mut del = None;
- for i in 0..core.cfg.categories.len() {
- let c = &mut core.cfg.categories[i];
- ui.horizontal(|ui| {
- ui.add(egui::TextEdit::singleline(&mut c.name).desired_width(100.0));
- ui.label(tr("folder"));
- ui.add(egui::TextEdit::singleline(&mut c.folder).desired_width(260.0).hint_text(tr("any")));
- if ui.button("…").clicked() {
- self.dlg(move || rfd::FileDialog::new().pick_folder().map(|p| Dlg::CatFolder(i, p)));
- }
- ui.label(tr("genre"));
- ui.add(egui::TextEdit::singleline(&mut c.genre).desired_width(90.0).hint_text(tr("any")));
- ui.label(tr("length"));
- ui.add(egui::DragValue::new(&mut c.min_secs).range(0.0..=3600.0).suffix("s"));
- ui.label("–");
- ui.add(egui::DragValue::new(&mut c.max_secs).range(0.0..=7200.0).suffix("s"));
- if delete_button(ui, ("category", i), tr("this category")) {
- del = Some(i);
- }
- });
- }
- if let Some(i) = del {
- core.cfg.categories.remove(i);
- }
- if ui.button(tr("➕ Add category")).clicked() {
- core.cfg.categories.push(Category { name: format!("Category {}", core.cfg.categories.len() + 1), ..Default::default() });
- }
- ui.separator();
- ui.strong(tr("Templates"));
- ui.horizontal(|ui| {
- for (i, n) in tpl_names.iter().enumerate() {
- ui.selectable_value(&mut self.tpl_sel, i, n);
- }
- if ui.button(tr("➕ New")).clicked() {
- core.cfg.templates.push(Template { name: format!("Template {}", core.cfg.templates.len() + 1), ..Default::default() });
- self.tpl_sel = core.cfg.templates.len() - 1;
- }
- });
- if self.tpl_sel >= core.cfg.templates.len() {
- self.tpl_sel = core.cfg.templates.len().saturating_sub(1);
- }
- let mut del_tpl = false;
- if let Some(t) = core.cfg.templates.get_mut(self.tpl_sel) {
- ui.horizontal(|ui| {
- ui.label(tr("Name"));
- ui.add(egui::TextEdit::singleline(&mut t.name).desired_width(140.0));
- ui.label(tr("Length"));
- ui.add(egui::DragValue::new(&mut t.minutes).range(5..=1440).suffix(" min"));
- ui.label(tr("Artist separation"));
- ui.add(egui::DragValue::new(&mut t.artist_gap).range(0..=50).suffix(" tracks"));
- });
- ui.label(RichText::new(tr("Pattern (repeats until the length is reached):")).color(GRAY));
- let mut pdel = None;
- for (k, p) in t.pattern.iter_mut().enumerate() {
- ui.horizontal(|ui| {
- ui.label(format!("{}.", k + 1));
- ui.add(egui::DragValue::new(&mut p.count).range(1..=20).suffix(" ×"));
- source_combo(ui, ("pat", k), &mut p.category, &cat_names, &rules);
- if ui.small_button("✖").clicked() {
- pdel = Some(k);
- }
- });
- }
- if let Some(k) = pdel {
- t.pattern.remove(k);
- }
- if ui.button(tr("➕ Add pattern step")).clicked() {
- t.pattern.push(PatternItem::default());
- }
- ui.label(
- RichText::new(tr("Jingles, adverts and other inserts by time (counted along the generated running order):"))
- .color(GRAY),
- );
- let mut mdel = None;
- for (k, m) in t.markers.iter_mut().enumerate() {
- ui.horizontal(|ui| {
- ui.label(tr("every"));
- ui.add(egui::DragValue::new(&mut m.every_mins).range(1..=600).suffix(" min"));
- ui.label(tr("insert"));
- ui.add(egui::DragValue::new(&mut m.count).range(1..=10).suffix(" ×"));
- ui.label(tr("from"));
- source_combo(ui, ("mk", k), &mut m.category, &cat_names, &rules);
- if ui.small_button("✖").clicked() {
- mdel = Some(k);
- }
- });
- }
- if let Some(k) = mdel {
- t.markers.remove(k);
- }
- ui.horizontal(|ui| {
- if ui
- .add_enabled(first_jingle.is_some(), egui::Button::new(tr("➕ Add jingles")))
- .on_hover_text(tr("Uses the files of a jingle rule (Advertisement scheduler) every 15 minutes"))
- .on_disabled_hover_text(tr("Make a jingle rule in the Advertisement scheduler first, or add a Jingles category"))
- .clicked()
- {
- t.markers.push(Marker { category: first_jingle.clone().unwrap_or_default(), every_mins: 15, count: 1 });
- }
- if ui.button(tr("➕ Add insert")).clicked() {
- t.markers.push(Marker::default());
- }
- ui.checkbox(&mut t.hour_markers, tr("Hour marker at the top of every hour"));
- });
- ui.horizontal(|ui| {
- if ui.button(RichText::new(tr("▶ Generate (replace playlist)")).color(GREEN)).clicked() {
- gen = Some((t.name.clone(), false));
- }
- if ui.button(tr("Append to playlist")).clicked() {
- gen = Some((t.name.clone(), true));
- }
- if delete_button(ui, ("template", self.tpl_sel), tr("this template")) {
- del_tpl = true;
- }
- });
- }
- if del_tpl {
- core.cfg.templates.remove(self.tpl_sel);
- }
- });
- if let Some((n, append)) = gen {
- let c = core.generate_playlist(&n, append);
- if c > 0 {
- core.say(format!("Generated {c} tracks from '{n}'"));
- }
- }
- }
-
fn tab_plugins(&mut self, ui: &mut egui::Ui, core: &mut Playout) {
ui.label(tr("Plugins are small programs, in any language, that RadioMaster runs when something happens on air — a song starts, the hour changes, an encoder drops. They can also send station commands back."));
ui.horizontal_wrapped(|ui| {
diff --git a/src/config.rs b/src/config.rs
index 70aed6c..f030be6 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -376,14 +376,7 @@ impl AdRule {
pub fn in_force(&self, now: &DateTime) -> bool {
use chrono::Timelike;
let today = now.format("%Y-%m-%d").to_string();
- let h = now.hour();
- let hours_ok = if self.from_hour == self.to_hour {
- true
- } else if self.from_hour < self.to_hour {
- h >= self.from_hour && h < self.to_hour
- } else {
- h >= self.from_hour || h < self.to_hour
- };
+ let hours_ok = hours_ok(self.from_hour, self.to_hour, now.hour());
self.enabled
&& (self.from_date.trim().is_empty() || today.as_str() >= self.from_date.trim())
&& (self.to_date.trim().is_empty() || today.as_str() <= self.to_date.trim())
@@ -461,14 +454,40 @@ impl AdRule {
pub struct Category {
pub name: String,
pub folder: String,
+ /// one genre, or several separated by commas ("Rock, Pop"): a track needs one of them
pub genre: String,
pub min_secs: f32,
/// 0 = no maximum
pub max_secs: f32,
+ /// release years (0 = no limit)
+ pub min_year: u32,
+ pub max_year: u32,
+ /// leave out tracks whose artist, title, genre or path has one of these words (comma separated)
+ pub exclude: String,
}
impl Default for Category {
fn default() -> Self {
- Self { name: "Music".into(), folder: String::new(), genre: String::new(), min_secs: 0.0, max_secs: 0.0 }
+ Self {
+ name: "Music".into(),
+ folder: String::new(),
+ genre: String::new(),
+ min_secs: 0.0,
+ max_secs: 0.0,
+ min_year: 0,
+ max_year: 0,
+ exclude: String::new(),
+ }
+ }
+}
+
+/// `h` is between the hours `from` and `to` (from == to: all day; 22 → 6 runs over midnight).
+pub fn hours_ok(from: u32, to: u32, h: u32) -> bool {
+ if from == to {
+ true
+ } else if from < to {
+ h >= from && h < to
+ } else {
+ h >= from || h < to
}
}
@@ -487,26 +506,88 @@ impl Default for PatternItem {
#[derive(Serialize, Deserialize, Clone)]
#[serde(default)]
pub struct Marker {
- /// a category name, or "rule:" for the files of an advert / jingle rule
+ /// a category name, "rule:" for the files of an advert / jingle rule, or
+ /// `generator::TIME_SOURCE` for a time announcement
pub category: String,
+ /// after every N songs, every N minutes, or at set times (like an advert / jingle rule)
+ pub trigger: Trigger,
+ pub every_songs: u32,
pub every_mins: u32,
+ /// every N minutes counted from the top of the hour (:00, :15…) instead of from the start
+ pub on_clock: bool,
+ /// (hour, minute) for `Trigger::Times`
+ pub times: Vec<(u32, u32)>,
/// how many to insert each time
pub count: u32,
+ /// only between these hours (from == to: all day)
+ pub from_hour: u32,
+ pub to_hour: u32,
}
impl Default for Marker {
fn default() -> Self {
- Self { category: "Music".into(), every_mins: 60, count: 1 }
+ Self {
+ category: "Music".into(),
+ // inserts made before 0.2.9 only had "every N minutes"
+ trigger: Trigger::Minutes,
+ every_songs: 4,
+ every_mins: 60,
+ on_clock: false,
+ times: vec![],
+ count: 1,
+ from_hour: 0,
+ to_hour: 0,
+ }
+ }
+}
+
+/// A different pattern for part of the day, e.g. talk and fewer songs on weekday mornings.
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(default)]
+pub struct Daypart {
+ pub name: String,
+ pub from_hour: u32,
+ pub to_hour: u32,
+ /// Monday … Sunday
+ pub days: [bool; 7],
+ pub pattern: Vec,
+}
+impl Default for Daypart {
+ fn default() -> Self {
+ Self { name: "Mornings".into(), from_hour: 6, to_hour: 10, days: [true; 7], pattern: vec![PatternItem::default()] }
+ }
+}
+impl Daypart {
+ pub fn covers(&self, t: &chrono::NaiveDateTime) -> bool {
+ use chrono::{Datelike, Timelike};
+ self.days[t.weekday().num_days_from_monday() as usize] && hours_ok(self.from_hour, self.to_hour, t.hour())
}
}
+/// How long a generated playlist runs.
+#[derive(Serialize, Deserialize, Clone, Copy, PartialEq, Eq, Debug, Default)]
+pub enum GenLength {
+ /// `Template::minutes`
+ #[default]
+ Minutes,
+ /// until the clock reaches `Template::until` (the next time it comes round)
+ Until,
+}
+
#[derive(Serialize, Deserialize, Clone)]
#[serde(default)]
pub struct Template {
pub name: String,
+ pub length: GenLength,
pub minutes: u32,
+ /// (hour, minute) for `GenLength::Until`
+ pub until: (u32, u32),
pub pattern: Vec,
+ /// patterns used instead of `pattern` at some times of day (the first that covers the time wins)
+ pub dayparts: Vec,
pub markers: Vec,
pub artist_gap: u32,
+ /// the same song doesn't come back within this many minutes (0 = whenever its pool runs out)
+ pub song_gap_mins: u32,
/// put an hour marker at the top of every hour
pub hour_markers: bool,
}
@@ -514,10 +595,14 @@ impl Default for Template {
fn default() -> Self {
Self {
name: "Default".into(),
+ length: GenLength::Minutes,
minutes: 120,
+ until: (0, 0),
pattern: vec![PatternItem::default()],
+ dayparts: vec![],
markers: vec![],
artist_gap: 5,
+ song_gap_mins: 0,
hour_markers: false,
}
}
diff --git a/src/generator.rs b/src/generator.rs
index 3558d88..da99330 100644
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -1,18 +1,38 @@
//! Playlist generator: builds multi-hour programming from templates
-//! (category pattern + rotations + markers + artist separation).
+//! (category pattern + time-of-day patterns + inserts by songs / minutes / set times + artist and
+//! song separation), laid out along the clock from the time the new rows will start.
-use crate::config::{Category, Template};
+use crate::config::{hours_ok, Category, GenLength, Marker, Template, Trigger};
use crate::library::Track;
+use chrono::{Duration, NaiveDateTime, NaiveTime, Timelike};
use rand::seq::SliceRandom;
use std::collections::{HashMap, VecDeque};
+/// Marker source that inserts a time announcement instead of tracks.
+pub const TIME_SOURCE: &str = "@time";
+/// Rough air time of a time announcement.
+pub const TIME_SECS: f32 = 4.0;
+
+/// One generated row.
+#[derive(Clone, Debug)]
+pub enum Gen {
+ /// a track from a pattern step (`insert` = false) or an insert
+ Track {
+ track: Track,
+ insert: bool,
+ },
+ TimeAnnounce,
+}
+
struct Bag {
idx: Vec,
pos: usize,
}
impl Bag {
- fn next(&mut self, lib: &[Track], avoid: &VecDeque) -> Option {
+ /// The next track: not by an artist in `avoid`, nor one of `recent` (falls back to the
+ /// first candidate when everything is blocked).
+ fn next(&mut self, lib: &[Track], avoid: &VecDeque, recent: &VecDeque<(usize, f64)>) -> Option {
if self.idx.is_empty() {
return None;
}
@@ -25,7 +45,7 @@ impl Bag {
let i = self.idx[self.pos];
self.pos += 1;
let a = lib[i].artist.to_lowercase();
- if a.is_empty() || !avoid.contains(&a) {
+ if (a.is_empty() || !avoid.contains(&a)) && !recent.iter().any(|r| r.0 == i) {
return Some(i);
}
fallback.get_or_insert(i);
@@ -34,17 +54,30 @@ impl Bag {
}
}
+fn words(s: &str) -> Vec {
+ s.split(',').map(|w| w.trim().to_lowercase()).filter(|w| !w.is_empty()).collect()
+}
+
fn pool(cat: &Category, lib: &[Track]) -> Vec {
let folder = cat.folder.trim();
- let genre = cat.genre.trim().to_lowercase();
+ let genres = words(&cat.genre);
+ let exclude = words(&cat.exclude);
let mut v: Vec = lib
.iter()
.enumerate()
.filter(|(_, t)| {
+ let year: u32 = t.year.trim().get(..4).and_then(|y| y.parse().ok()).unwrap_or(0);
+ let genre = t.genre.to_lowercase();
(folder.is_empty() || t.path.starts_with(folder))
- && (genre.is_empty() || t.genre.to_lowercase().contains(&genre))
+ && (genres.is_empty() || genres.iter().any(|g| genre.contains(g.as_str())))
&& t.duration >= cat.min_secs
&& (cat.max_secs <= 0.0 || t.duration <= cat.max_secs)
+ && (cat.min_year == 0 || year >= cat.min_year)
+ && (cat.max_year == 0 || (year > 0 && year <= cat.max_year))
+ && (exclude.is_empty() || {
+ let hay = format!("{} {} {} {}", t.artist, t.title, t.genre, t.path.display()).to_lowercase();
+ !exclude.iter().any(|w| hay.contains(w.as_str()))
+ })
})
.map(|(i, _)| i)
.collect();
@@ -52,14 +85,57 @@ fn pool(cat: &Category, lib: &[Track]) -> Vec {
v
}
-/// Build the tracks for template `t`. `preset` gives ready-made pools (indexes into `lib`) for
-/// sources that aren't categories, e.g. "rule:3" = the files of advert / jingle rule 3.
-pub fn generate(t: &Template, cats: &[Category], lib: &[Track], preset: &HashMap>) -> Vec