Index: NEWS ================================================================== --- NEWS +++ NEWS @@ -6,13 +6,15 @@ - A new channel plugin for "Radio-Browser.info" has been bundled. - Another plugin for interfacing with "RadioTray" was introduced, to share bookmarks via DBUS once RadioTray implements it. - Notebook tabs are now on the left per default, and can be rearranged directly in the GUI. +- The configuration dialog now indicates the availability of selected + audio players. Default audio players are now automatically configured + during the first startup. - Gtk properties are now utilized more over internal UI state vars. - And the GtkBuilder UI file is now compressed. -- The Gtk2 fallback file became redundant. +- The the GtkBuilder UI file is now compressed, the Gtk2 fallback removed. - The former channel icon PNGs are now embedded. - Theme configuration was removed. - Category retrieval became more resilient. - HTTP timeouts have been added. - The bookmarks tab, settings window, search dialog, stream inspector/editor @@ -20,11 +22,11 @@ - The packaging layout has been slightly restructured - to support relocatable installations (for PyZIP package). - Minor fixes to youtube, internet_radio, punkcast, timer and other plugins. - Help pages have been updated further, as well as CREDITS, README and general PACKAGING infos, and most plugin short descriptions. -- The project fossil wiki now contains a more details on plugin APIs. +- The project wiki now contains a more details on plugin APIs. 2.1.4 (2015-03-25) - Fixed Internet-Radio extraction. - Added basic TuneIn channel. - Removed Dirble and MusicGoal channels. ADDED help/action_edit.page Index: help/action_edit.page ================================================================== --- help/action_edit.page +++ help/action_edit.page @@ -0,0 +1,34 @@ + + + + + + Edit or inspect a station entry. + + + 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.)

+
+ + +
Index: help/action_playing.page ================================================================== --- help/action_playing.page +++ help/action_playing.page @@ -16,11 +16,11 @@ 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 Index: help/action_recording.page ================================================================== --- help/action_recording.page +++ help/action_recording.page @@ -20,11 +20,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/action_saving.page ================================================================== --- help/action_saving.page +++ help/action_saving.page @@ -9,11 +9,11 @@ Saving

You can export the currently selected stream using - Station Save or + Station Save or by pressing 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 Index: help/channel_bookmarks.page ================================================================== --- help/channel_bookmarks.page +++ help/channel_bookmarks.page @@ -12,12 +12,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.

@@ -26,11 +26,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.

Index: help/channel_internetradioorguk.page ================================================================== --- help/channel_internetradioorguk.page +++ help/channel_internetradioorguk.page @@ -9,14 +9,14 @@ Large radio directory from the UK. 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/channel_surfmusik.page ================================================================== --- help/channel_surfmusik.page +++ help/channel_surfmusik.page @@ -25,10 +25,11 @@ Channel options. <code>Language</code>

There's an English and a German variant of this radio directory. Genres are - also localized.

+ also localized. Restart streamtuner2 after switching the Language option. Then + use Channel Reload category tree.

Index: help/channel_xiph.page ================================================================== --- help/channel_xiph.page +++ help/channel_xiph.page @@ -29,10 +29,10 @@ <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 change this option. OGG starts to sound well with 96 kbit/s (whereas - MP3 often requires 148 or 192 at least).

+ MP3 often requires 128 or 160 kbit/s at least).

Index: help/channel_youtube.page ================================================================== --- help/channel_youtube.page +++ help/channel_youtube.page @@ -30,11 +30,11 @@ Channel options. <code>Region</code> -

With the country dropdown you can predefine which mostPopular listins are returned.

+

With the country dropdown you can predefine which mostPopular listings are returned.

<code>My Channels</code>

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 Index: help/channels.page ================================================================== --- help/channels.page +++ help/channels.page @@ -10,14 +10,16 @@ Channels

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

- Tabs + Tabs

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:

@@ -44,11 +46,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.

Index: help/config_apps.page ================================================================== --- help/config_apps.page +++ help/config_apps.page @@ -31,20 +31,21 @@ 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:

Format

Application

audio/*

xterm -e streamripper %srv

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

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.

@@ -30,10 +31,11 @@ Channel Plugins

Every channel tab can have specific options. These are configured here. Also you can disable channels you don't need.

+
Player application settings @@ -49,18 +51,25 @@

Placeholder

Alternatives

URL/Filename type

%m3u

%f %g %m

Provides a local .m3u file for the streaming station

%pls

%url %u %r

Either a remote .pls resource, or a local .pls file (if converted)

audio/*

vlc --one-instance

video/*

totem

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

Recording Apps @@ -71,11 +80,11 @@

audio/*

xterm -e streamripper %srv

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

@@ -100,15 +109,10 @@ 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.

@@ -116,23 +120,23 @@ 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.

[<input>250</input>] 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 @@ -178,10 +182,12 @@

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), Index: help/global_key.page ================================================================== --- help/global_key.page +++ help/global_key.page @@ -8,11 +8,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.

@@ -29,9 +29,10 @@

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.

ADDED help/img/channels-left.png Index: help/img/channels-left.png ================================================================== --- help/img/channels-left.png +++ help/img/channels-left.png cannot compute difference between binary files ADDED help/img/configapps.png Index: help/img/configapps.png ================================================================== --- help/img/configapps.png +++ help/img/configapps.png cannot compute difference between binary files ADDED help/img/configplugins.png Index: help/img/configplugins.png ================================================================== --- help/img/configplugins.png +++ help/img/configplugins.png cannot compute difference between binary files ADDED help/img/configtabs.png Index: help/img/configtabs.png ================================================================== --- help/img/configtabs.png +++ help/img/configtabs.png cannot compute difference between binary files DELETED help/img/inkscape_pasted_image_20100831_165045.png Index: help/img/inkscape_pasted_image_20100831_165045.png ================================================================== --- help/img/inkscape_pasted_image_20100831_165045.png +++ help/img/inkscape_pasted_image_20100831_165045.png cannot compute difference between binary files DELETED help/img/inkscape_pasted_image_20100831_171132.png Index: help/img/inkscape_pasted_image_20100831_171132.png ================================================================== --- help/img/inkscape_pasted_image_20100831_171132.png +++ help/img/inkscape_pasted_image_20100831_171132.png cannot compute difference between binary files DELETED help/img/inkscape_pasted_image_20100831_171614.png Index: help/img/inkscape_pasted_image_20100831_171614.png ================================================================== --- help/img/inkscape_pasted_image_20100831_171614.png +++ help/img/inkscape_pasted_image_20100831_171614.png cannot compute difference between binary files ADDED help/img/search.png Index: help/img/search.png ================================================================== --- help/img/search.png +++ help/img/search.png cannot compute difference between binary files ADDED help/img/streamedit.png Index: help/img/streamedit.png ================================================================== --- help/img/streamedit.png +++ help/img/streamedit.png cannot compute difference between binary files ADDED help/img/timer.png Index: help/img/timer.png ================================================================== --- help/img/timer.png +++ help/img/timer.png cannot compute difference between binary files Index: help/index.page ================================================================== --- help/index.page +++ help/index.page @@ -37,9 +37,9 @@ Index: help/reloading.page ================================================================== --- help/reloading.page +++ help/reloading.page @@ -6,15 +6,17 @@ 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 - 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.

Index: help/search.page ================================================================== --- help/search.page +++ help/search.page @@ -25,10 +25,12 @@

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 Index: help/timer.page ================================================================== --- help/timer.page +++ help/timer.page @@ -11,12 +11,13 @@ Timer

You can programm play/recording events with the timer plugin. Simply select a station and choose Station Extensions Add timer.... A small popup will ask for a data/time string. If you press OK the station - and the programmed time - will be stored in the bookmarks channel in the "timer" category.

+ and the programmed time will be stored in the bookmarks channel in the "timer" category.

+ + Timer

Note that streamtuner2 must be running for the programmed timer events to work. (In a future version there might be the option to have it handled by the system cron daemon.)