This patch has been incorporated into the get_iplayer Git repo.
Instructions for updating are here:

https://github.com/dinkypumpkin/get_iplayer/wiki/instructions

Commit message and patch follow:

Eliminates spurious error message:

ERROR: Failed to get iphone URL from iplayer site
---
 get_iplayer   |   13 ++++++-------
 get_iplayer.1 |    9 ++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/get_iplayer b/get_iplayer
index 6b21c5d..2f20fba 100755
--- a/get_iplayer
+++ b/get_iplayer
@@ -121,7 +121,7 @@ my $opt_format = {
        hash            => [ 1, "hash!", 'Recording', '--hash', "Show recording 
progress as hashes"],
        metadataonly    => [ 1, "metadataonly|metadata-only!", 'Recording', 
'--metadata-only', "Create specified metadata info file without any recording 
or streaming (can also be used with thumbnail option)."],
        mmsnothread     => [ 1, "mmsnothread!", 'Recording', '--mmsnothread', 
"Disable parallel threaded recording for mms"],
-       modes           => [ 0, "modes=s", 'Recording', '--modes 
<mode>,<mode>,...', "Recoding modes: 
iphone,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma"],
+       modes           => [ 0, "modes=s", 'Recording', '--modes 
<mode>,<mode>,...', "Recoding modes: 
flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma"],
        multimode       => [ 1, "multimode!", 'Recording', '--multimode', 
"Allow the recording of more than one mode for the same programme - WARNING: 
will record all specified/default modes!!"],
        overwrite       => [ 1, "overwrite|over-write!", 'Recording', 
'--overwrite', "Overwrite recordings if they already exist"],
        partialproxy    => [ 1, "partial-proxy!", 'Recording', 
'--partial-proxy', "Only uses web proxy where absolutely required (try this 
extra option if your proxy fails)"],
@@ -3111,8 +3111,7 @@ sub usage {
                '.PP',
                'If given no arguments, \fBget_iplayer\fR updates and displays 
the list of currently available programmes.',
                'Each available programme has a numerical identifier, 
\fBpid\fR.',
-               '\fBget_iplayer\fR records BBC iPlayer programmes by pretending 
to be an iPhone, which means that some programmes in the list are unavailable 
for recording.',
-               'It can also utilise the \fBflvstreamer\fR tool to record 
programmes from RTMP flash streams at various qualities.',
+               '\fBget_iplayer\fR utilises the \fBrtmpdump\fR tool to record 
BBC iPlayer programmes from RTMP flash streams at various qualities.',
                '.PP',
                'In PVR mode, \fBget_iplayer\fR can be called from cron to 
record programmes to a schedule.',
                '.SH "OPTIONS"' if $manpage;
@@ -6364,7 +6363,7 @@ sub channels_schedule {
 # Class cmdline Options
 sub opt_format {
        return {
-               tvmode          => [ 1, "tvmode|vmode=s", 'Recording', 
'--tvmode <mode>,<mode>,...', "TV Recoding modes: 
iphone,rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi 
(default: flashhigh,flashstd,flashnormal)"],
+               tvmode          => [ 1, "tvmode|vmode=s", 'Recording', 
'--tvmode <mode>,<mode>,...', "TV Recoding modes: 
rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi 
(default: flashhigh,flashstd,flashnormal)"],
                outputtv        => [ 1, "outputtv=s", 'Output', '--outputtv 
<dir>', "Output directory for tv recordings"],
                vlc             => [ 1, "vlc=s", 'External Program', '--vlc 
<path>', "Location of vlc or cvlc binary"],
                rtmptvopts      => [ 1, "rtmp-tv-opts|rtmptvopts=s", 
'Recording', '--rtmp-tv-opts <options>', "Add custom options to flvstreamer for 
tv"],
@@ -6402,7 +6401,7 @@ sub modelist {
        # Deal with BBC TV fallback modes and expansions
        # Valid modes are iphone,rtmp,flashhigh,flashnormal,flashlow,n95_wifi
        # 'rtmp' or 'flash' => 'flashhigh,flashnormal'
-       $mlist = main::expand_list($mlist, 'best', 
'flashhd,flashvhigh,flashhigh,iphone,flashstd,flashnormal,flashlow');
+       $mlist = main::expand_list($mlist, 'best', 
'flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow');
        $mlist = main::expand_list($mlist, 'flash', 
'flashhigh,flashstd,flashnormal');
        $mlist = main::expand_list($mlist, 'rtmp', 
'flashhigh,flashstd,flashnormal');
 
@@ -7255,7 +7254,7 @@ sub channels_schedule {
 # Class cmdline Options
 sub opt_format {
        return {
-               radiomode       => [ 1, "radiomode|amode=s", 'Recording', 
'--radiomode <mode>,<mode>,...', "Radio Recording mode(s): 
iphone,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma 
(default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow)"],
+               radiomode       => [ 1, "radiomode|amode=s", 'Recording', 
'--radiomode <mode>,<mode>,...', "Radio Recording mode(s): 
flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma 
(default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow)"],
                bandwidth       => [ 1, "bandwidth=n", 'Recording', 
'--bandwidth', "In radio realaudio mode specify the link bandwidth in bps for 
rtsp streaming (default 512000)"],
                lame            => [ 0, "lame=s", 'External Program', '--lame 
<path>', "Location of lame binary"],
                outputradio     => [ 1, "outputradio=s", 'Output', 
'--outputradio <dir>', "Output directory for radio recordings"],
@@ -7315,7 +7314,7 @@ sub modelist {
        # 'rtmp' or 'flash' => 'flashaudio,flashaac'
        # flashaac => flashaachigh,flashaacstd,flashaaclow
        # flashaachigh => flashaachigh1,flashaachigh2
-       $mlist = main::expand_list($mlist, 'best', 
'flashaachigh,flashaacstd,iphone,flashaudio,realaudio,flashaaclow,wma');
+       $mlist = main::expand_list($mlist, 'best', 
'flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow,wma');
        $mlist = main::expand_list($mlist, 'flash', 'flashaudio,flashaac');
        $mlist = main::expand_list($mlist, 'rtmp', 'flashaudio,flashaac');
        $mlist = main::expand_list($mlist, 'flashaac', 
'flashaachigh,flashaacstd,flashaaclow');
diff --git a/get_iplayer.1 b/get_iplayer.1
index 27c14bc..4fc7b3a 100644
--- a/get_iplayer.1
+++ b/get_iplayer.1
@@ -26,8 +26,7 @@ search terms and recording programmes automatically. It can 
also stream or recor
 .PP
 If given no arguments, \fBget_iplayer\fR updates and displays the list of 
currently available programmes.
 Each available programme has a numerical identifier, \fBpid\fR.
-\fBget_iplayer\fR records BBC iPlayer programmes by pretending to be an 
iPhone, which means that some programmes in the list are unavailable for 
recording.
-It can also utilise the \fBflvstreamer\fR tool to record programmes from RTMP 
flash streams at various qualities.
+\fBget_iplayer\fR utilises the \fBrtmpdump\fR tool to record BBC iPlayer 
programmes from RTMP flash streams at various qualities.
 .PP
 In PVR mode, \fBget_iplayer\fR can be called from cron to record programmes to 
a schedule.
 .SH "OPTIONS"
@@ -192,7 +191,7 @@ Create specified metadata info file without any recording 
or streaming (can also
 Disable parallel threaded recording for mms
 .TP
 \fB\-\-modes <mode>,<mode>,...
-Recoding modes: 
iphone,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma
+Recoding modes: 
flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma
 .TP
 \fB\-\-mp3vbr
 Set LAME VBR mode to N (0 to 9) for AAC transcoding. 0 = target bitrate 245 
Kbit/s, 9 = target bitrate 65 Kbit/s (requires \-\-aactomp3)
@@ -216,7 +215,7 @@ When used with \-\-pid record all the embedded pids if the 
pid is a series or br
 Web proxy URL e.g. 'http://USERNAME:PASSWORD@SERVER:PORT' or 
'http://SERVER:PORT'
 .TP
 \fB\-\-radiomode <mode>,<mode>,...
-Radio Recording mode(s): 
iphone,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma 
(default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow)
+Radio Recording mode(s): 
flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma 
(default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow)
 .TP
 \fB\-\-raw
 Don't transcode or change the recording/stream in any way (i.e. 
radio/realaudio, rtmp/flv)
@@ -267,7 +266,7 @@ Download Thumbnail image if available
 Only Download Thumbnail image if available, not the programme
 .TP
 \fB\-\-tvmode <mode>,<mode>,...
-TV Recoding modes: 
iphone,rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi 
(default: flashhigh,flashstd,flashnormal)
+TV Recoding modes: 
rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi 
(default: flashhigh,flashstd,flashnormal)
 .TP
 \fB\-\-url "<url>"
 Record the embedded media player in the specified URL. Use with 
\-\-type=<type>.
-- 
1.7.8.3


_______________________________________________
get_iplayer mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/get_iplayer

Reply via email to