Index: help/action_playing.page ================================================================== --- help/action_playing.page +++ help/action_playing.page @@ -16,15 +16,15 @@ formats (MP3 or OGG). In the 'Apps' section of the settings dialog, you can associate a 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 these circumstance it might be sensible to write + 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 purposes.

Index: help/action_recording.page ================================================================== --- help/action_recording.page +++ help/action_recording.page @@ -22,8 +22,11 @@

You can influence all these behaviours with -arguments to the streamripper program. Please refer to the manpage of streamripper. The options are too broad to list here. You can set default arguments (e.g. another default save directory) in the Config > Apps dialog.

+ +

As alternative check out fIcy/fPls + for recording ICEcast/SHOUTcast streaming servers.

Index: help/action_saving.page ================================================================== --- help/action_saving.page +++ help/action_saving.page @@ -15,10 +15,10 @@ 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 must edit the + Note that the lower right dropdown has no effect. You have to edit the filename field.

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

It's easy to lose overview when you browse across channel tabs, +

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

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

ADDED help/channel_icast.page Index: help/channel_icast.page ================================================================== --- help/channel_icast.page +++ help/channel_icast.page @@ -0,0 +1,18 @@ + + + + + + iCast + + + iCast.io + +

iCast is another huge collaborative radio station directory.

+ +

Its support in Streamtuner2 is quite robust, as it provides a JSON API. + It lacks in meta data information though (homepages, currently playing, listeners, etc.)

+ +
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 also - lacks station homepages in most cases, but is a likewise - encyclopedical. Genres are similiar to Shoutcast.

+

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 for how many +

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

ADDED help/channel_itunes.page Index: help/channel_itunes.page ================================================================== --- help/channel_itunes.page +++ help/channel_itunes.page @@ -0,0 +1,16 @@ + + + + + + iTunes (RoliSoft Playlists) + + + iTunes Radios via RS + +

iTunes radio is indirectly supported through the RoliSoft Radio Playlist + APIs.

+ +
ADDED help/channel_live365.page Index: help/channel_live365.page ================================================================== --- help/channel_live365.page +++ help/channel_live365.page @@ -0,0 +1,23 @@ + + + + + + Live365 radio network + + + Live365 + +

Live365 is a radio broadcasting service and directory. It categorizes stations in + over 250 genres. Not all radio stations are free to listen however. It's a commercial + provider. Therefore streamtuner2 tries to filter result lists.

+ +

This channel plugin is known to break once in a while. And it can't be guaranteed + to pass working streaming URLs to audio players.

+ +

If it breaks once more, it's going to get removed. (Unless someone else sends in + a patch, of course!)

+ +
ADDED help/channel_modarchive.page Index: help/channel_modarchive.page ================================================================== --- help/channel_modarchive.page +++ help/channel_modarchive.page @@ -0,0 +1,24 @@ + + + + + + MOD files. + + + The MOD Archive + +

MODArchive is a collection of module/tracker files. It's a community project, and + categorizes individual audio files. You'll need a MOD-capable audio player.

+ + +

XMP/libxmp

+

MikMod

+

MODPlug for XMMS

+

GModplay

+

VLC (built-in support)

+
+ +
Index: help/channel_myoggradio.page ================================================================== --- help/channel_myoggradio.page +++ help/channel_myoggradio.page @@ -11,22 +11,24 @@ MyOggRadio

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

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

-

The personal section is empty, unless you specify an user account in the settings - and actually bookmarks stations on the MyOggRadio web site. Shared entries are not - automatically in the MOR favorite list.

+

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.

+

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

Channel options. <code>Login settings</code> ADDED help/channel_tunein.page Index: help/channel_tunein.page ================================================================== --- help/channel_tunein.page +++ help/channel_tunein.page @@ -0,0 +1,17 @@ + + + + + + Radio and Podcast directory. + + + TuneIn + +

TuneIn hosts a major radio, show and podcast directory. It also provides the + RadioTime/AIR interface for listener feedback or something. ST2 queries the OPML + lists only for radio stations currently.

+ +
Index: help/cli.page ================================================================== --- help/cli.page +++ help/cli.page @@ -45,7 +45,10 @@

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 + 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 @@ -13,19 +13,19 @@ configure most of them as target application. Mostly it makes sense to use a single application for all audio formats. But at least the */* media type should be handled by a generic player, like vlc.

- - - - - - - - - + + + + + + + + +
Audaciousaudacious %m3uaudio
XMMS2xmms2 %m3uaudio
Amarokamarok -l %plsaudio
Exaileexaile %m3uaudio
Amarokamarok -l %plsaudio
mplayermplayer %srvconsole
VLCvlc %uvideo/*
Totemtotem %uvideo/*
Media Playermplayer2.exe %plsWin32
Audacious audacious %m3u audio
XMMS2 xmms2 %m3u audio
Amarok amarok -l %pls audio
Exaile exaile %m3u audio
Amarok amarok -l %pls audio
mplayer mplayer %srv console
VLC vlc %u video/*
Totem totem %u video/*
Media Player mplayer2.exe %pls Win32

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

Streamtuner2 is written in Python, a rather easy programming language. And it's also rather simple to write a new channel plugin.

The basic layout of every channel plugin is as follows:

-

+ from channels import * class myplugin (ChannelPlugin): @@ -41,11 +41,11 @@ # get it from somewhere # ... return entries -

+

There are some self-explanatory description fields, and two important methods. Sometimes you don't need categories even. The update_streams() function often downloads a website, parses it with regular expressions or PyQuery / DOM methods, and packs into into a result list.

Index: help/global_key.page ================================================================== --- help/global_key.page +++ help/global_key.page @@ -17,21 +17,21 @@ all the time, but still want to switch radios easily.

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

- - - - - - - + + + + + + +
keyspec:corresponds to:
F9Responds to only F9. (too generic)
<Meta>Roften the 'Windows'-key and R
<Ctrl>NControl and N
<Shift>F1Shift and F1
<Alt>SPACEUse Alt and Space. (too generic)
XF86ForwardUses a "forward" function key. (default)

keyspec

corresponds to

F9

Responds to only F9. (too generic)

<Meta>R

often the 'Windows'-key and R

<Ctrl>N

Control and N

<Shift>F1

Shift and F1

<Alt>SPACE

Use Alt and Space. (too generic)

XF86Forward

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.

Index: help/technical.page ================================================================== --- help/technical.page +++ help/technical.page @@ -29,36 +29,36 @@
Configuration files - /home/$USER/.config/streamtuner2/ + <file>/home/$USER/.config/streamtuner2/</file>

Corresponds to the XDG_CONFIG_HOME setting. All ST2 configuration settings are contained within here and are in JSON format.

- ~/.config/streamtuner2/settings.json + <file>~/.config/streamtuner2/settings.json</file>

General runtime options, plugin settings, and configured audio players.

- ~/.config/streamtuner2/window.json + <file>~/.config/streamtuner2/window.json</file>

Saved window sizes, list widths.

- ~/.config/streamtuner2/state.json + <file>~/.config/streamtuner2/state.json</file>

Last category in each channel tab.

- ~/.config/streamtuner2/bookmarks.json + <file>~/.config/streamtuner2/bookmarks.json</file>

Is a separate cache file for your bookmarked/favourite radio stations.

- ~/.config/streamtuner2/cache/***.json + <file>~/.config/streamtuner2/cache/***.json</file>

JSON files for stream lists in each channel.

- ~/.config/streamtuner2/icons/*.png + <file>~/.config/streamtuner2/icons/*.png</file>

Holds downloaded favicons for station homepages.

@@ -65,19 +65,19 @@
Installation spread - /usr/bin/streamtuner2 + <file>/usr/bin/streamtuner2</file>

Is the main binary.

- /usr/share/streamtuner2/ + <file>/usr/share/streamtuner2/</file>

Contains the individual ST2 python modules, and plugins in channels/. Also packages in pyquery/, but which is only used if the according modules aren't installed by the distribution.

- /usr/share/doc/streamtuner2/ + <file>/usr/share/doc/streamtuner2/</file>

Contains the README, and Mallard/gnome-help/yelp files under help/.