Index: help/action_playing.page ================================================================== --- help/action_playing.page +++ help/action_playing.page @@ -19,11 +19,11 @@

Use the โ–ถ play toolbar button.

Right click for the context menu and the play action.

 -

Drag and drop it directly into your audio player.

 +

Drag and drop it directly into your audio player. (Only on U*ix/X11 systems)

Save it (F2) to a playlist file, then start your player with that.

 Index: help/channel_filtermusic.page ================================================================== --- help/channel_filtermusic.page +++ help/channel_filtermusic.page @@ -16,11 +16,11 @@ focused on electro/dance/pop stations.

There's around a dozen categories with 20-30 radios each.

Prioritizes stations on listener popularity and freshness or something.

 -

The plugin fetches a XML list of stations, or extracts from the homepage.

 +

The plugin fetches an XML list of stations, or extracts from the homepage.

Most useful if you don't like to browse around, and want to listen to most popular stations.

Index: help/channel_somafm.page ================================================================== --- help/channel_somafm.page +++ help/channel_somafm.page @@ -23,10 +23,10 @@

It provides streaming links in different audio formats. Only AAC64 is guaranteed to be available for all. Other bitrates depend on the station.

-

After reconfiguring the bitrate/format, you can Reload the - station list to update them. Otherwise refreshing has no effect.

- +

After reconfiguring the bitrate/format, you can Reload the station list to update them. + Otherwise refreshing has no effect.

Index: help/channel_xiph.page ================================================================== --- help/channel_xiph.page +++ help/channel_xiph.page @@ -66,12 +66,12 @@

The website listings contain full station homepages and a few more extras. In this mode we can even acceess the XSPF playlist formats directly. Both, the server search function, or browsing by audio/video format are supported.

A miximum of 100 entries get fetched in this mode however - (which is 5 pages รก 20 entries).

 + (which is 5 pages ร  20 entries).

The filter-by-bitrate option is now a generic plugin.

Index: help/cli.page ================================================================== --- help/cli.page +++ help/cli.page @@ -21,11 +21,11 @@ Examples <code>streamtuner2 play "station"</code>

This command looks through all channel plugins, and finds a station containing the mentioned title. You must put the station title in quotes in shell calls, if it contains - e.g. spaces. You can optionally specify a channelname before the station title.

+ e.g. spaces. You can optionally specify a channel name before the station title.

 <code>streamtuner2 url [channel] "station"</code>

Just looks up the streaming URL for a given station. If no channel name is given, ST2 searches through all available channel plugins again.

Index: help/config_apps.page ================================================================== --- help/config_apps.page +++ help/config_apps.page @@ -85,12 +85,12 @@
Other placeholders

In addition to stream URL + type placeholders (%r, %x, - %pls, %m3u, etc), you can also pass row - placeholders. These contain the stream information like title or + %pls, %m3u, etc), you can also pass station + info placeholders. These contain the stream information like title or bitrate, or any other internal field:

Index: help/configuration.page ================================================================== --- help/configuration.page +++ help/configuration.page @@ -146,11 +146,11 @@ โ˜‘ Prefer HTML traversing (PyQuery) over regex

Some channels provide proper APIs to fetch station lists. Others are just websites that require scraping listings out. Most channel tabs provide two alternative methods for that. The DOM/HTML selection method is sometimes slower, but more reliable. As fallback streamtuner2 - plugins often use a regex to match text. Occassionally the regex method is surprisingly more exact, + plugins often use a regex to match text. Occasionally the regex method is surprisingly more exact, because directory services often use frightful unstructured HTML. If available, both methods are tried. You can influence the order with this setting, and thus speed it up.

 ๐Ÿ”Ÿ Limit stream number @@ -159,23 +159,23 @@ load more or fewer station entries. Some plugins have own settings (in the 'Plugins' section) even. For the major plugins this however limits how many scrollable entries appear in the stream lists.

 โ˜‘ Retain deleted stations

When enabled, keeps old station entries when - updating/reloading a category/genre. Services often forget stations or throws them out when inavailable. + updating/reloading a category/genre. Services often forget stations or throw them out when inavailable. With this option enabled, these entries are kept in streamtuner2 as strikethrough entries (often at the end of the list).

 - โ˜‘ Update favouries from freshened URLs + โ˜‘ Update favourites from freshened URLs

Streaming URLs in bookmarked stations get renewed on category reloads/updates. This isn't very reliable, as often station titles change together with the streaming URLs.

 โ˜‘ Save station lists after updates

After reloading (F5) the updated station lists are - autoamtically saved. For favicon updates or drag and drop events this + automatically saved. For favicon updates or drag and drop events this only happens automatically when this option is set.

 @@ -184,11 +184,11 @@ โ˜‘ Reuse .m3u/.pls files

When converting online station playlists, streamtuner2 creates temporary files like shoutcast.11539398391891.m3u for your audio player. It'll keep those files around in /tmp/streamtuner2 until you quit. That speeds up switching between and reconnecting to a previous station. It's in particular necessary when you use โญ or โช directly in your player. - For %pls references your player typically usues the online-only playlist + For %pls references your player typically uses the online-only playlist files anyway. If you disable this option, then converted pls/m3u/xspf files get recreated repeatedly.

โ˜‘ Forgo any playlist conversion @@ -199,11 +199,11 @@ the literal server/playlist streaming URL then.

Note that this is only a minor speedup, but may trip up some applications. A few channel sources don't even provide standard stream addresses and playlists. (Jamendo albums for example really need pre-conversion; no audio player can deal with such custom JSON playlists). In short: you don't normally want to enable this flag - unless you run into problems - with streamtuner2 taking too long, or when it hang by accidentially downloading streams + with streamtuner2 taking too long, or when it hangs by accidentially downloading streams itself.

 Index: help/contrib_features.page ================================================================== --- help/contrib_features.page +++ help/contrib_features.page @@ -57,11 +57,11 @@
๐Ÿ”Œ RadioTray hook

This plugin enables an extra category in the bookmarks tab. It shows bookmarked stations from the RadioTray application, if that's - installed. Additionally it adds an context option to save new stations + installed. Additionally it adds a context option to save new stations from Streamtuner2 to RadioTray. The mapping option influences if added radios are recategorized in RadioTray.

Please see the Wiki for further setup instructions.
Index: help/dragndrop.page ================================================================== --- help/dragndrop.page +++ help/dragndrop.page @@ -16,11 +16,11 @@ copy a stream/station address directly.

Now it's not guaranteed to work with all applications or file managers, as X11/Gtk DND support is somewhat arcane and wonky. You may specifically have to adapt the default export format for - this. Generally a XSPF or PLS file gets created for file managers. + this. Generally an XSPF or PLS file gets created for file managers. While VLC is one of the few applications that understands direct playlist URLs or literal M3U/PLS payloads even.

Index: help/glossary.page ================================================================== --- help/glossary.page +++ help/glossary.page @@ -23,11 +23,12 @@ Stream

"stream" is a technical term which means continuosly flowing data. MP3 radio music for example is streamed, because it's not just a time-limited audio file, but unending (unless you stop the player or paying your ISP).

-

In streamtuner2 the terms "stream" and radio "station" are used interchangably.

+

In streamtuner2 the terms "stream" and radio "station" are used + interchangeably.

Genre

Music genres are represented as "categories" in the left @@ -50,11 +51,11 @@

Favicons

Favicons are small symbols for - websites. Most website should have one. (ST2 downloads + websites. Most websites should have one. (ST2 downloads favicons either per menu command or automatically for the current station once you hit play.)

Index: help/html/cli.html ================================================================== --- help/html/cli.html +++ help/html/cli.html @@ -22,11 +22,11 @@

Examples

streamtuner2 play "station"

This command looks through all channel plugins, and finds a station containing the mentioned title. You must put the station title in quotes in shell calls, if it contains - e.g. spaces. You can optionally specify a channelname before the station title.

+ e.g. spaces. You can optionally specify a channel name before the station title.

streamtuner2 url [channel] "station"

Just looks up the streaming URL for a given station. If no channel name is given, ST2 searches through all available channel plugins again.

streamtuner2 stream shoutcast "station"

Prints available station data as JSON

Index: help/html/config_apps.html ================================================================== --- help/html/config_apps.html +++ help/html/config_apps.html @@ -130,12 +130,12 @@

Other placeholders

In addition to stream URL + type placeholders (%r, %x, - %pls, %m3u, etc), you can also pass row - placeholders. These contain the stream information like title or + %pls, %m3u, etc), you can also pass station + info placeholders. These contain the stream information like title or bitrate, or any other internal field:

Placeholder

As variable

Field content

%title

$title

Station title

Index: help/html/configuration.html ================================================================== --- help/html/configuration.html +++ help/html/configuration.html @@ -134,29 +134,29 @@
โ˜‘ Prefer HTML traversing (PyQuery) over regex

Some channels provide proper APIs to fetch station lists. Others are just websites that require scraping listings out. Most channel tabs provide two alternative methods for that. The DOM/HTML selection method is sometimes slower, but more reliable. As fallback streamtuner2 - plugins often use a regex to match text. Occassionally the regex method is surprisingly more exact, + plugins often use a regex to match text. Occasionally the regex method is surprisingly more exact, because directory services often use frightful unstructured HTML. If available, both methods are tried. You can influence the order with this setting, and thus speed it up.

๐Ÿ”Ÿ Limit stream number

Constraints the length of station lists per category. The number of stations option is not honored by all channel plugins. Often it's not possible to load more or fewer station entries. Some plugins have own settings (in the 'Plugins' section) even. For the major plugins this however limits how many scrollable entries appear in the stream lists.

โ˜‘ Retain deleted stations

When enabled, keeps old station entries when - updating/reloading a category/genre. Services often forget stations or throws them out when inavailable. + updating/reloading a category/genre. Services often forget stations or throw them out when inavailable. With this option enabled, these entries are kept in streamtuner2 as strikethrough entries (often at the end of the list).

-
โ˜‘ Update favouries from freshened URLs
+
โ˜‘ Update favourites from freshened URLs

Streaming URLs in bookmarked stations get renewed on category reloads/updates. This isn't very reliable, as often station titles change together with the streaming URLs.

โ˜‘ Save station lists after updates

After reloading (F5) the updated station lists are - autoamtically saved. For favicon updates or drag and drop events this + automatically saved. For favicon updates or drag and drop events this only happens automatically when this option is set.

Playlist

@@ -165,11 +165,11 @@

When converting online station playlists, streamtuner2 creates temporary files like shoutcast.11539398391891.m3u for your audio player. It'll keep those files around in /tmp/streamtuner2 until you quit. That speeds up switching between and reconnecting to a previous station. It's in particular necessary when you use โญ or โช directly in your player. - For %pls references your player typically usues the online-only playlist + For %pls references your player typically uses the online-only playlist files anyway. If you disable this option, then converted pls/m3u/xspf files get recreated repeatedly.

โ˜‘ Forgo any playlist conversion

Per default most server playlists (be they .pls or .m3u, .xpsf) are converted. @@ -180,11 +180,11 @@

Note that this is only a minor speedup, but may trip up some applications. A few channel sources don't even provide standard stream addresses and playlists. (Jamendo albums for example really need pre-conversion; no audio player can deal with such custom JSON playlists). In short: you don't normally want to enable this flag - unless you run into problems - with streamtuner2 taking too long, or when it hang by accidentially downloading streams + with streamtuner2 taking too long, or when it hangs by accidentially downloading streams itself.

Index: help/html/contrib_features.html ================================================================== --- help/html/contrib_features.html +++ help/html/contrib_features.html @@ -67,11 +67,11 @@

๐Ÿ”Œ RadioTray hook

This plugin enables an extra category in the bookmarks tab. It shows bookmarked stations from the RadioTray application, if that's - installed. Additionally it adds an context option to save new stations + installed. Additionally it adds a context option to save new stations from Streamtuner2 to RadioTray. The mapping option influences if added radios are recategorized in RadioTray.

Please see the Wiki for further setup instructions.

Index: help/html/dragndrop.html ================================================================== --- help/html/dragndrop.html +++ help/html/dragndrop.html @@ -19,11 +19,11 @@ directly into VLC or any running music player. That'll usually copy a stream/station address directly.

Now it's not guaranteed to work with all applications or file managers, as X11/Gtk DND support is somewhat arcane and wonky. You may specifically have to adapt the default export format for - this. Generally a XSPF or PLS file gets created for file managers. + this. Generally an XSPF or PLS file gets created for file managers. While VLC is one of the few applications that understands direct playlist URLs or literal M3U/PLS payloads even.

Importing

Index: help/html/filtermusic.html ================================================================== --- help/html/filtermusic.html +++ help/html/filtermusic.html @@ -25,11 +25,11 @@

Filtermusic summarizes all the common genres, but is primarily focused on electro/dance/pop stations.

  • There's around a dozen categories with 20-30 radios each.

  • Prioritizes stations on listener popularity and freshness or something.

    • -

  • The plugin fetches a XML list of stations, or extracts from the homepage.

    • +

  • The plugin fetches an XML list of stations, or extracts from the homepage.

Most useful if you don't like to browse around, and want to listen to most popular stations.

Index: help/html/glossary.html ================================================================== --- help/html/glossary.html +++ help/html/glossary.html @@ -20,11 +20,12 @@

"stream" is a technical term which means continuosly flowing data. MP3 radio music for example is streamed, because it's not just a time-limited audio file, but unending (unless you stop the player or paying your ISP).

-

In streamtuner2 the terms "stream" and radio "station" are used interchangably.

+

In streamtuner2 the terms "stream" and radio "station" are used + interchangeably.

Genre

Music genres are represented as "categories" in the left pane. Every channel groups its music stations into some structure.

@@ -38,11 +39,11 @@
Radio

Plays music. Sometimes interrupted by advertisements.

Favicons

Favicons are small symbols for - websites. Most website should have one. (ST2 downloads + websites. Most websites should have one. (ST2 downloads favicons either per menu command or automatically for the current station once you hit play.)

Cache

Radio lists are kept in "cache" files for efficiency reasons. To not redownload stream information on every category or channel Index: help/html/playing.html ================================================================== --- help/html/playing.html +++ help/html/playing.html @@ -22,11 +22,11 @@

To start playing a station, you can:

  • Just double click an entry.

  • Use the โ–ถ play toolbar button.

  • Right click for the context menu and the play action.

    • -

  • Drag and drop it directly into your audio player.

    • +

  • Drag and drop it directly into your audio player. (Only on U*ix/X11 systems)

  • Save it (F2) to a playlist file, then start your player with that.

In streamtuner2 you can configure different audio players for different audio formats (MP3 or OGG). In the Apps section of the settings dialog, you can associate one player Index: help/html/somafm.html ================================================================== --- help/html/somafm.html +++ help/html/somafm.html @@ -31,12 +31,12 @@

Bitrate configuration

It provides streaming links in different audio formats. Only AAC64 is guaranteed to be available for all. Other bitrates depend on the station.

-

After reconfiguring the bitrate/format, you can Reload the - station list to update them. Otherwise refreshing has no effect.

+

After reconfiguring the bitrate/format, you can Reload the station list to update them. + Otherwise refreshing has no effect.

Placeholder

As variable