Index: help/action_homepage.page ================================================================== --- help/action_homepage.page +++ help/action_homepage.page @@ -8,11 +8,11 @@ Radio homepages -

Most radio stations are listed with a homepage URL. Use the house symbol in the +

Most radio stations are listed with a homepage URL. Use the house symbol in the toolbar or right click homepage to open it in a web browser.

Some homepage links are guessed, because some channels (e.g. Shoutcast) don't provide them (anymore). If you play a station without homepage URL, it automatically gets googled. (The link will be visible once you reselect the genre/category.) Index: help/action_playing.page ================================================================== --- help/action_playing.page +++ help/action_playing.page @@ -11,11 +11,12 @@ Playing

Simply double click a station entry. It starts with your configured audio player.

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 a player + formats (MP3 or OGG). In the Apps section of the + settings dialog, you can associate one player with each audio file (MIME) type. Per default this is audacious, but you can use any other media player (like VLC).

Note however that some audio players will run multiple instance and won't allow simple station switching. In such situations it might be sensible to write Index: help/action_recording.page ================================================================== --- help/action_recording.page +++ help/action_recording.page @@ -9,29 +9,33 @@ Save radio songs as MP3 files via streamripper. Recording -

Most stations that stream MP3 or OGG music can be recorded. This is accomplished through -the command-line tool "streamripper". If you select a station and press ● record, -a console window should appear, where streamripper shows its progress.

+

Most stations that stream MP3 or OGG music can be recorded. This is +accomplished through the command-line tool streamripper. If you +select a station and press ● record, a console +window should appear, where streamripper shows its progress.

+

You can configure the recording tool according to audio types again.

Streamripper -

The xterm -e prefix brings up the terminal popup, to follow streamrippers -progress. Remove that for silent downloads.

+

The xterm -e prefix brings up the terminal popup. If you want +silent downloads in the background instead of seeing its progress, remove +the xterm call.

Format

Application

audio/*

xterm -e streamripper %srv

To configure a default download directory, use the -d option to streamripper. For example xterm -e "streamripper -d /media/music/" would use an absolute path. -Else it downloads to the current working directory (often your HOME path).

+Else it downloads to the current working directory (often your HOME path), +and creates one directory per radio station there.

fIcy/fPls Index: help/action_saving.page ================================================================== --- help/action_saving.page +++ help/action_saving.page @@ -9,16 +9,20 @@ Saving

You can export the currently selected stream using - Station Save. A file dialog - opens, where you can adapt the title. The extension of the filename - decides on the saved link format. Per default a .m3u file is - created, because most audio players understand this format.

- -

But you can also save in .pls or .xspf or .asx or .smil format. - Note that the lower right dropdown has no effect. You have to edit the - filename field.

+ Station Save or + F2. A file dialog opens, where you can adapt the title. +

+ +

The extension of the filename decides on the saved link format. Per + default a .m3u file is created, because that's what most audio players + understand.

+ +

But you can also save in .pls or .xspf + or .asx or .smil format. Note that the + lower right dropdown has no effect. You have to edit the extension + into the filename field.

Index: help/channel_bookmarks.page ================================================================== --- help/channel_bookmarks.page +++ help/channel_bookmarks.page @@ -9,31 +9,37 @@ Collect favourites via bookmark function, entry editing and deleting. Bookmarks -

It's easy to lose oversight when switching across channel tabs, - genres and internet radio stations. Therefore streamtuner2 allows - to bookmark stations to collect favoured streams in a single place.

- -

Just right click a station you want to bookmark, and choose bookmark in the context - menu. Alternatively you can use the Streams entry in the application menu. Once bookmarked - you can see the station entry in the (!) "bookmarks" tab, under "favourite". That's where - they go.

+

Streamtuner2 allows to bookmark favoured streams/stations. + Which is what the bookmarks tab is for, of course.

+ +

Use the right click a stations context menu bookmark + or F8.

+ +

Once bookmarked the station is listed under + bookmarks favourite. + Additionally every appearance of the station in channel tabs gets a ★ + star icon.

Editing -

Entries can be removed from the bookmark list again. Use the edit menu for that.

+

Entries can be removed from the bookmark list again. Use + Edit Delete or the DEL + key for that.

-

Bookmarked stations are shown with a star in all other channel tabs. If you delete the - entry there, it won't remove it from the real bookmarks list.

+

You can also manually adapt an entry via Station Edit or F3. +

+
Subcategories

The bookmarks tab can display other categories besides "favourite". For example the search feature creates a "search", while the "timer" and "links" plugins also display lists here.

-

However the favourite list itself can not yet be categorized further.

+

However the favourite list itself can not yet be categorized + further.

Index: help/channel_jamendo.page ================================================================== --- help/channel_jamendo.page +++ help/channel_jamendo.page @@ -6,20 +6,46 @@ Creative Commons music and artist hub. - Jamendo - -

Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio - files for individual musicians and artists. Tracks and albums can thus be downloaded - free of charge. Yeah, imagine that.

- -

The new Jamendo v3.0 is now utilized. It allows to list albums, - playlists, and individual tracks by genre. The radio list is static - (they're looping over randomized songs from each genre.)

- -

Instead of favicons, streamtuner2 can fetch album or track - covers. Thus the images are a bit larger, and retrieving them all - via Channel > Load favicons... takes a while longer.

+Jamendo + +

Jamendo is a Creative Comments licensing oriented music distributor. It hosts audio +files for individual musicians and artists. Tracks and albums can thus be downloaded +free of charge. Yeah, imagine that.

+ +

The new Jamendo v3.0 is now utilized. It allows to list albums, +playlists, and individual tracks by genre. The radio list is static +(they're looping over randomized songs from each genre.)

+ +

Instead of favicons, streamtuner2 can fetch album or track +covers. Thus the images are a bit larger, and retrieving them all +via Channel Load favicons... +takes a while longer.

+ +
+<link xref="configuration">Config</link> options + + System + + Streaming format +

You can switch between MP3 and Ogg Vorbis audio streams for Jamendo. + It's not honored by the radio section, but albums and tracks should be + received as Ogg when configured so.

+
+ + Preview image sizes +

Album covers are downloaded in lieu of favicons. They're available + in different sizes. Use 25px if you want just favicon-sized icons.

+
+ + Result length +

Currently only 1 page (of 200 entries each) of album/track lists are + fetched.

+

Setting a higher value may not work.

+
+
+
+ Index: help/channel_modarchive.page ================================================================== --- help/channel_modarchive.page +++ help/channel_modarchive.page @@ -19,6 +19,10 @@

MODPlug for XMMS

GModplay

VLC (built-in support)

+

See recording + configuration if you want to enable the download mode. (Audio + files are packaged up in ZIP files on MODArchive.)

+ Index: help/channel_myoggradio.page ================================================================== --- help/channel_myoggradio.page +++ help/channel_myoggradio.page @@ -13,19 +13,19 @@

MyOggRadio is an open source internet radio directory project. Since it provides its station list as JSON it's very well supported.

-

Because the directory is currently still rather small, - streamtuner2 provides the option to share radion station links. Use - the Station Extensions - Share... menu entry to upload the currently - selected radio (from your favourite bookmarks).

+

To help with populating the directory further, + streamtuner2 provides an option to share radion station links. + Use Station Extensions + Share on MyOggRadio... menu entry to upload the currently + selected radio (e.g. from your favourite bookmarks).

The personal section is empty per default. You need to specify an user account - in the settings dialog, and actually bookmark stations in MyOggRadio web site. - Shared entries are not automatically in the MOR favorite list.

+ in the settings dialog, and actually bookmark stations in the MyOggRadio web site. + Shared entries aren't automatically in the MOR favorite list.

There's also JMyOggRadioPlayer as specific frontend and player for MyOggRadio.

Index: help/channel_shoutcast.page ================================================================== --- help/channel_shoutcast.page +++ help/channel_shoutcast.page @@ -15,24 +15,16 @@ station lists on shoutcast.com.

Station entries usually provide current playing information.

-

Stream links are plain PLS files.

+

Stream links are plain PLS files.

Genres are subcategorized, so the main groups in the category list must be expanded to see the interesting entries.

Since being sold from AOL to Radionomy, the directory got cut down. There are no longer entries for currently played songs, and homepage links are largely gone. Hencewhy the Shoutcast channel is no longer considered a primary feature.

- - There are a few plugin options for this channel. - - <code>PyQuery parsing</code> -

Uses an XML parser to extract station data from within HTML <tags> of the shoutcast.com site. This is - slower, but often more reliable than regular expressions, which look for plain text markers.

-
-
Index: help/channel_xiph.page ================================================================== --- help/channel_xiph.page +++ help/channel_xiph.page @@ -28,11 +28,11 @@ Channel options. <code>Filter by minimum bitrate</code>

The bitrate of an audio stream determines the music quality. Many Xiph streams have simple and low quality microphone sources. To filter these out, and only leave high quality music - stations, you can therefore set this option. OGG starts to sound well with 96 kbit/s (whereas + stations, you can therefore change this option. OGG starts to sound well with 96 kbit/s (whereas MP3 often requires 148 or 192 at least).

Index: help/channel_youtube.page ================================================================== --- help/channel_youtube.page +++ help/channel_youtube.page @@ -13,13 +13,21 @@

Googles Youtube provides a quirky JSON API that makes browsing channels and genres feasible. This beta plugin provides a little overview, and usually retrieves recent video uploads.

-

VLC can directly play Youtube URLs. For other players the default application - setting wraps youtube-dl, which is also - used for recording.

+

VLC can directly play Youtube URLs. For other players one can use + youtube-dl as wrapper. + For example totem $(youtube-dl %srv) as configured player + command.

+ +

Youtube-dl is preconfigued as "recording"/download tool for this channel + tab.

+ +

Of course you could also just invoke a specific YT video by + opening it in your web browser - click the station home + button simply.

Channel options. @@ -31,8 +39,12 @@

You can edit the list of YT channel names to fetch some of your favourite artists/uploaders. To apply this setting, and have new categories show up in the genre pane, use Channel Update category tree first.

It's not an exact map, but utilizes the search function to find channels.

+ + <code>Wadsworth constant</code> +

Only influences the video homepage link.

+
Index: help/channels.page ================================================================== --- help/channels.page +++ help/channels.page @@ -39,12 +39,12 @@ Channel service homepage

You can dobule click the channel tab to visit the channel/directory homepage. Alternatively there is an entry in the Channel menu.

-
- Channel menu options +
+ Channel menu actions Homepage of directory service

Opens a webbrowser with the current channels website.

@@ -59,14 +59,14 @@ Reload category tree

Updates the genre list in the left category pane. For most channels the category list is already complete, but it might - change over time. So this option often only is used for initializing streamtuner2 + change over time. So this option is often only used for initializing streamtuner2 channels when the list is empty.

The channel menu also contains a list of available channels. Select an entry to switch into that tab.

Index: help/cli.page ================================================================== --- help/cli.page +++ help/cli.page @@ -46,9 +46,12 @@

Specifying a channel name is often optional. If you add one, it should be all-lowercase. You can also give a list, like "shoutcast,xiph" which would be searched then.

-

GUI mode: There are also --gtk3 and --gtk2 command line options. Usually the right toolkit +

+ GUI options +

There are also --gtk3 and --gtk2 command line options. Usually the right toolkit is picked depending on Python version. But you can manually override this.

+
Index: help/config_apps.page ================================================================== --- help/config_apps.page +++ help/config_apps.page @@ -1,12 +1,12 @@ + - Common applications to use as players. Audio players Index: help/configuration.page ================================================================== --- help/configuration.page +++ help/configuration.page @@ -8,11 +8,12 @@ F12 brings up the options window with the Player, Display, System and Plugin sections. Settings dialog -

There are various options for streamtuner2, available under Edit +

+There are various options for streamtuner2, available under Edit Preferences or via F12.

It's separated into three main areas. @@ -100,11 +101,11 @@

Bookmarked stations will be marked with a ★ star in all other station lists / categories. That doesn't often work for the same station entry from two different channel services / tabs though.

Gtk+ theme -

Be careful. While Gtk allows to select a different theme per application, not all themes +

Be careful. While Gtk allows to select a different theme per application, not all themes work right away. Switching the theme might hang streamtuner2. Just restart if that happens.

Save window states

Automatically remember window size, selected channel tab, categories, or selected station. @@ -152,18 +153,18 @@ System Temporary files -

Streamtuner2 creates temporary .m3u files, if an audio player is configured to use %m3u files - instead of %pls or %srv URLs. For archival purposes, you might want to set a dedicated directory +

Streamtuner2 creates temporary .m3u files - for audio players that are configured to use %m3u files + instead of %pls or %srv URLs. For archival purposes you might want to set a dedicated directory for this. Leave this to the default /tmp else.

Config directory -

Is where streamtuner2 keeps its settings.json and channel caches, favicons, etc. - You can't set this in the config dialog. This is just for display. Set the XDG_CONFIG_HOME +

Is where streamtuner2 keeps its settings.json and channel caches, favicons, etc. + You can't set this in the config dialog. This is just for display. Set the XDG_CONFIG_HOME environment variable to adapt.

Enable debug messages

If you start streamtuner2 from a terminal window (xterm/rxvt), you can get a load of state @@ -181,13 +182,13 @@ you want to enable. You have to restart Streamtuner2 for any changes here to take effect.

Each channel plugin may come with its own set of addition configuration settings below.

-

If you want to find out more about the short option descriptions (most settings are checkboxes), +

If you want to find out more about the short option descriptions (most settings are checkboxes), please have a look into the channels directory /usr/share/streamtuner2/channels/ and corresponding - *.py files. These are readable, and sometimes contain more information.

+ *.py files. These are readable, and sometimes contain more information.

Index: help/global_key.page ================================================================== --- help/global_key.page +++ help/global_key.page @@ -1,7 +1,7 @@ Global keyboard shortcut for radio switching. @@ -11,12 +11,12 @@

Using the global_key extension you can define a keyboard shortcut for switching within a list of favourite radio stations. Per default it uses your bookmarks list, but it can be configured to alternate in any other channel.

-

This is useful if you don't want to keep the streamtuner2 window in the foreground - all the time, but still want to switch radios easily.

+

This is useful if you don't want to keep streamtuner2 atop your + desktop all the time, but still want to switch radios easily.

Go into settings F12 for plugins to define a keyboard shortcut:

Index: help/glossary.page ================================================================== --- help/glossary.page +++ help/glossary.page @@ -1,11 +1,11 @@ - + Technical and streamtuner2 specific terminology and jargon. Glossary Index: help/glossary_pls.page ================================================================== --- help/glossary_pls.page +++ help/glossary_pls.page @@ -9,13 +9,14 @@ .PLS files

Playlist files often have the extension .pls

-

It's the primary station stream link format of SHOUTcast.

+

It's the primary station stream link format of SHOUTcast, and was + popularized by WinAmp.

-

The MIME type of these files is audio/x-scpls and they often look like:

+

The MIME type of these files is audio/x-scpls and they often look like:

[playlist] numberofentries=1 File1=http://123.45.67.189:8222 Index: help/introduction.page ================================================================== --- help/introduction.page +++ help/introduction.page @@ -31,13 +31,13 @@ What else can you do?

Double clicking an entry row in the radio list starts your audio player. But there are other functions available. Either go to the Station menu, or access the context menu with a right click.

keyspec

corresponds to

- - - + + + Index: help/reloading.page ================================================================== --- help/reloading.page +++ help/reloading.page @@ -7,14 +7,14 @@ Updating station lists. Reloading

Station information can get stale. Especially Shoutcast invalidates old information - frequently. Therefore you have to [Reload] the lists. There is an action button below + frequently. Therefore you have to Reload the lists. There is an action button below the menu bar for this. It retrieves the current data from the directory service.

Favicons aren't loaded automatically. There is a menu entry in Channels for that, which works in the background and doesn't display the new icons automatically either. Simply reselect the category/genre in the left pane. Or again, use the station reload button.

Index: help/search.page ================================================================== --- help/search.page +++ help/search.page @@ -32,16 +32,15 @@ channel/service.

Then there are two search methods. You mostly want to use the live Server search. It passes your search terms to the actual directory services, and loads the most recent data into a - result list (this might take a few seconds). It's not implemented + result list. This might take a few seconds. And it's not implemented for all channel plugins however.

With Cache find would just look up entries in your - already downloaded channel/genre lists. Since often you are just - looking for something you had already seen, this will give you the - desired results.

+ already downloaded channel/genre lists. This is sufficient when + you're just looking for something previously seen/listended to.

Index: help/technical.page ================================================================== --- help/technical.page +++ help/technical.page @@ -1,29 +1,29 @@ - + Filenames, Directories, Dependencies Technical information
Dependencies -

Python 2.7 or 3.x

-

PyGtk or PyGI

+

Python 2.7 or 3.x

+

PyGtk or PyGI

Gtk2 or Gtk3

-

Requests/urllib3

+

Requests/urllib3

Soft dependencies -

Python-LXML

-

Python-PyQuery

+

Python-LXML

+

Python-PyQuery

Python-Kronos

Audacious

Play

Starts the radio in a configured audio player

Record

Opens a terminal window and streamripper, which cuts the radio broadcast into individual mp3 songs.

Bookmarks

Copy radio entry over into the bookmarks channel.

Play

Starts the radio in a configured audio player

Record

Opens a terminal window and streamripper, which cuts the radio broadcast into individual mp3 songs.

Bookmarks

Copy radio entry over into the bookmarks channel.

Homepage

Most radio stations have a homepage. Open this in a web browser.

Saving

A radio entry can be exported as .m3u or .pls file.

Extensions

Some plugins add other features in this submenu.

Editing

This command is in the Edit and context menu, allows to inspect and modify radio descriptions.

Searching

You can get a radio list according to search criteria.