ADDED help/exportcat.page Index: help/exportcat.page ================================================================== --- help/exportcat.page +++ help/exportcat.page @@ -0,0 +1,27 @@ + + + + + Exporting a whole category as .pls. + + + Export all stations + +

There's an "Export All" plugin available. It adds an entry under + Main menu Extensions Export all stations. + Which allows to export all stations from the currently visible channel category.

+ +

This is of course intended primarily for saving your bookmarks. + And it allows to import radio lists into any other music player + or playlist collection/management app (such as Rhythmbox).

+ +
+ Configuration option +

You can set the default export format in the settings dialog + F12.

+

Currently it only supports .PLS playlist exports however.

+
+ + Index: help/html/bookmarks.html ================================================================== --- help/html/bookmarks.html +++ help/html/bookmarks.html @@ -19,12 +19,12 @@

Bookmarks

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.

+

Use right click for a stations context menu ▸ bookmark + or just press F8.

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

@@ -32,11 +32,12 @@

Editing

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

-

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

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

Subcategories

Index: help/html/channels.html ================================================================== --- help/html/channels.html +++ help/html/channels.html @@ -13,13 +13,15 @@

Channels

The tabs in the main window represent the music directory channels/services. Each lists categories/genres and their associated radios/streams.

-
+

The notebook tabs can also be repositioned with - Edit ▸ Channel tab position ▸ Left.

+ Edit ▸ Channel tab position ▸ Left. + And since 2.1.5 you can directly reorder the channel tabs themselves, + by dragging them around.

If you first select a channel tab, the categories should appear or be loading. Otherwise:

  1. Select a channel tab

  2. Choose Channel ▸ Reload categories...

    3. @@ -55,11 +57,12 @@

    Channel menu actions

    Homepage of directory service
    -

    Opens a webbrowser with the current channels website.

    +

    Opens the website of the currently selected channel + in your configured web browser.

    Reload

    Updates the current category and displays fresh station lists.

    Update favicons...

    Starts assembling favicons for the current list of stations in the background. To actually display the freshly loaded favicons, reselect the current category.

    Index: help/html/config_apps.html ================================================================== --- help/html/config_apps.html +++ help/html/config_apps.html @@ -67,20 +67,21 @@

    Some audio players open a second instance when you actually want to switch radios. In this case it's a common workaround to write pkill vlc ; vlc %u instead, which ends the previous player process and starts it anew. For VLC there's however also the --one-instance option, which sometimes works better. (And sometimes not.)

    -

    Some applications, like Rhythmbox or Banshee, are primarily audio browsers, not players, +

    Some applications, like Rhythmbox or Banshee, are primarily playlist managers, not players, and cannot be invoked with a play URL by other apps. This makes them less suitable for use with - streamtuner2.

    + streamtuner2. (Same goes for streamtuner2 of course. It's not a player, just a playlist tool.)

    URL placeholders

    Any listed application can be invoked with a different kind of - URL or filename.be invoked with a play URL by other apps. Which to - use often depends on the application.

    + URL or filename. Most are rather flexible, but some depend on + specific playlist file types or URLs. You can control this by adding + a placeholder after the configured application name:

    Index: help/html/configuration.html ================================================================== --- help/html/configuration.html +++ help/html/configuration.html @@ -14,12 +14,13 @@

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

    +

    -

    It's separated into three main areas.

    +

    It's separated into three main sections / tabs.

    Player

    Lists audio formats and the audio player applications, or recording tools below. It's a file type to application table. Double click an entry for editing.

    Options
    @@ -60,16 +61,21 @@

    Placeholder

    Alternatives

    URL/Filename type

    video/youtube

    vlc %srv
    -

    Application names are always lowercase binary names. Double click an entry to edit it.

    +

    Application names are most always lowercase binary names. Double click an entry to edit it. + After editing the icon next to the application name will be updated. If it stays green, it's + likely to work. If it turns red / into a stop symbol, then the entered name is likely incorrect.

    +

    After the application name, you can use a placeholder like "%pls" (default), or "%m3u" and "%src". See placeholders.

    Catch-all entries like */* or a generic audio/* entry allow to configure a default player. While video/youtube is specific to the Youtube channel. And url/http a psdeudo MIME type to configure a web browser (for station homepages).

    +

    You can remove default entries by clearing both the Format field and its associated Application. + Add completely new associations through the emtpy line. (Reopen the dialog to add another one.)

    Audio players — Common applications to use as players.

    Recording Apps

    @@ -84,11 +90,11 @@

    video/youtube

    xterm -e "youtube-dl %srv"

    -

    To define a target directory, you can add commandline arguments to each. Also it's typically +

    To define a target directory, you can often add commandline arguments to each. Also it's typically helpful to leave the xterm prefix on, so you can follow the processing state. (Alternatively to xterm there is x-terminal-emulator, or rxvt, gnome-terminal, xfce4-terminal, etc.)

    Recording — Save radio songs as MP3 files via streamripper.
    @@ -107,13 +113,10 @@ Alternatively use Channel ▸ Update favicons... to update all station icons at once.

    Show bookmark star

    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 - 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. Also keeps the width of station list columns. If disabled, you can manually save the current layout/selections via Edit ▸ Save States.

    @@ -120,21 +123,21 @@

Station loading

Prefer HTML traversing (PyQuery) over regex
-

Some channels provide proper APIs to fetch station lists. Others are just websites, that +

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 more reliable. As fallback streamtuner2 plugins - often use a regex to match text. Occassionally the regex method is actually more reliable, + 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, because directory services often use frightful unstructured HTML. If available, both methods - are tried. You can influence the order with this setting.

+ are tried. You can influence the order with this setting, and thus speed it up.

[250] Limit stream number

Constraints the length of station lists per category. - The number of stations setting is not honored by all channel plugins. Often it's not possible to + 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 much scroll text appears in the stream lists.

+ 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. With this option enabled, these entries are kept in streamtuner2 as strikethrough entries (often at the end of the list).

@@ -169,10 +172,11 @@

Plugin and Channel settings

This tab lists all available channel and feature plugins. Mark checkboxes for those plugins 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), please have a look into the channels directory /usr/share/streamtuner2/channels/ and corresponding *.py files. These are readable, and sometimes contain more information.

ADDED help/html/edit.html Index: help/html/edit.html ================================================================== --- help/html/edit.html +++ help/html/edit.html @@ -0,0 +1,50 @@ + + + + +Edit + + + +
+
+
+

Edit

+
+
+

You probably don't often need this. But there's an +  ▸ Edit/Details context menu + which brings up a station editor: +

+
+

You can see the standard title and genre fields here. But also a + few internally kept infos. For example the "url" field contains the + actual pls/m3u/server address. While the "format" can list a + non-standard audio compression type.

+

This dialog is primarily useful for your personal bookmarks. + It allows to shorten or rename things. You can even use + new to add new entries this way. + (Which doesn't make sense in regular channel categories, because + changes will be lost once you hit Reload.)

+
+ +
+
+
+
+
+ ADDED help/html/exportcat.html Index: help/html/exportcat.html ================================================================== --- help/html/exportcat.html +++ help/html/exportcat.html @@ -0,0 +1,47 @@ + + + + +Export all stations + + + +
+
+
+

Export all stations

+
+
+

There's an "Export All" plugin available. It adds an entry under + Main menu ▸ Extensions ▸ Export all stations. + Which allows to export all stations from the currently visible channel category.

+

This is of course intended primarily for saving your bookmarks. + And it allows to import radio lists into any other music player + or playlist collection/management app (such as Rhythmbox).

+
+
+

Configuration option

+
+

You can set the default export format in the settings dialog + F12.

+

Currently it only supports .PLS playlist exports however.

+
+
+ +
+
+
+
+
+ Index: help/html/global_key.html ================================================================== --- help/html/global_key.html +++ help/html/global_key.html @@ -16,11 +16,11 @@

Global_key

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 + a list of favourited 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 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:

@@ -53,13 +53,14 @@

Uses a "forward" function key. (default)

To define another channel as source, enter its module name in the according field. Also add a category separated by : colon here.

-

If the configured keyboard shortcut conflicts with another application, - it won't work. And if you choose it too generic, you won't be able to type longer - documents. Also found out: key names are case sensitive.

+

If the configured keyboard shortcut conflicts + with another application, it won't work. And if you choose it too + generic, you won't be able to type longer documents. Also found + out: key names are case sensitive.

Configuration

@@ -82,13 +94,16 @@

Additional features

CLI (command line interface) — Console interface, exporting data.
+
Export all stations — Exporting a whole category as .pls.
+
+
Global_key — Global keyboard shortcut for radio switching.
+
Timer — Programming recurring play and recording events.
-
Timer — Programming recurring play and recording events.

Internet-Radio.com

-

Internet-Radio.com is a broad alternative to Shoutcast. It - has regained station homepages for most entries again. +

Internet-Radio.com is a broad alternative to Shoutcast. + It has regained station homepages for most entries again. Genres are similiar to Shoutcast.

Note that this plugin has its own setting on how many links to retrieve. Instead of stream numbers, it only counts pages (which however speeds up processing now).

Index: help/html/myoggradio.html ================================================================== --- help/html/myoggradio.html +++ help/html/myoggradio.html @@ -26,20 +26,34 @@ 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 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.

+ Shared entries aren't automatically in the personal list.

+

MyOggRadio also has a neat cross-platform player: + JMyOggRadioPlayer.

Channel options.

Login settings
-

If you want to upload station infos to MyOggRadio, you need an account there. Registration - is free and doesn't require personal information nor email address. Specify username and - password separated with a : colon in this field.

+
+

If you want to upload station infos to MyOggRadio, you need an account there. + Registration is free and doesn't require personal information nor email address. + Specify it as username: separated with a : colon in this field.

+
+

Alternatively you can store your account settings in the central + ~/.netrc config file. Or in ~/.config/netc even.

+

Your entry for MyOggRadio should follow the common format:

+
machine myoggradio.org
+    login usr123
+    password pw123
+

Which is useful because it's a standard format, and prevents + leaking authorization data into per-application config stores. + Note that a user:pw setting in streamtuner takes precedence + though.

+
+
stream URL format

When uploading stations, the streaming URL can be converted into RAW format. You can however leave it as .PLS link file.

Index: help/html/playing.html ================================================================== --- help/html/playing.html +++ help/html/playing.html @@ -21,11 +21,11 @@

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 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 +

Note however that some audio players will run multiple instances and won't allow simple station switching. In such situations it might be sensible to write a wrapper script, or configure special commandline arguments to your favoured audio player (e.g. "vlc --one-instance").

It's also possible to save a station entry as .m3u or .pls file, and load this manually in your player. You might even want to collect such .m3u files for archival / backup Index: help/html/recording.html ================================================================== --- help/html/recording.html +++ help/html/recording.html @@ -9,13 +9,13 @@

-♪ Streamtuner2  › Functions »
+♪ Streamtuner2  › Configuration » Settings dialog › Recording Apps »

Recording

@@ -27,11 +27,11 @@

Streamripper

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

Index: help/html/reloading.html ================================================================== --- help/html/reloading.html +++ help/html/reloading.html @@ -12,12 +12,13 @@

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 - the menu bar for this. It retrieves the current data from the directory service.

+ 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.

Searching

There are two search functions.

@@ -31,10 +31,11 @@

Search window

You can get to the search dialog via Edit ▸ Find or Ctrl+F. Centrally to this dialog is the text field, where you can specify the phrase to scan for.

+

It either will search in all channels, or just the last active 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 Index: help/html/streams.html ================================================================== --- help/html/streams.html +++ help/html/streams.html @@ -18,15 +18,17 @@ automatically to conserve bandwidth and because live information is seldomly available.)

You can double click a station line to get it to play. Alternatively there are the play and record buttons in the menubar. You can also invoke a stations homepage, if it has one.

+
Functions

Actions

Bookmarks — Collect favourites via bookmark function, entry editing and deleting.
+
Edit — Edit or inspect a station entry.
Playing — Double click a station to start it in your audio player.
Radio homepages — Start a web browser for a station.
Recording — Save radio songs as MP3 files via streamripper.
Reloading — Updating station lists.
Saving — Export a station entry as .m3u/.pls file.
@@ -35,13 +37,14 @@

Context menu

Additionally most actions are available in a context menu. Right click a station entry to display it.

-

You can always click the current category in the left list, to have the current - station list redisplayed. Which is useful after updating favicons, or accidental - dragging of entries.

+
+

You can reach them in the Main menu ▸ Stations + as well. The Extensions ▸ submenu there will + list a few other plugin extensions.

Format

Application