Merge branch 'master' of https://github.com/karjonas/get-flash-videos

2 files changed, 8 insertions, 10 deletions

diff --git a/lib/FlashVideo/Site/Svtplay.pm b/lib/FlashVideo/Site/Svtplay.pm
index b5c682a..56e3ec1 100644
--- a/lib/FlashVideo/Site/Svtplay.pm
+++ b/lib/FlashVideo/Site/Svtplay.pm
@@ -6,6 +6,7 @@ use warnings;
 
 use FlashVideo::Utils;
 use FlashVideo::JSON;
+use HTML::Entities;
 
 sub find_video {
   my ($self, $browser, $embed_url, $prefs) = @_;
@@ -14,10 +15,10 @@ sub find_video {
   if ($browser->uri->as_string !~ m/video\/([0-9]*)/) {
     die "No video id found in url";
   }
-
   my $video_id = $1;
+  $browser->content =~ m/<title>(.+)<\/title>/;
+  my $name = decode_entities($1);
   my $info_url = "http://www.svtplay.se/video/$video_id?output=json";
-
   $browser->get($info_url);
     
   if (!$browser->success) {
@@ -25,7 +26,6 @@ sub find_video {
   }
 
   my $video_data = from_json($browser->content);
-  my $name = $video_data->{context}->{title};
   my $bitrate = 0;
   my $rtmp_url;
 
diff --git a/lib/FlashVideo/Site/Tv3play.pm b/lib/FlashVideo/Site/Tv3play.pm
index c11e060..312a9fa 100644
--- a/lib/FlashVideo/Site/Tv3play.pm
+++ b/lib/FlashVideo/Site/Tv3play.pm
@@ -68,13 +68,11 @@ sub find_video_viasat {
   };
 
 
-  return{
-      rtmp => $rtmp,
-      swfVfy => "http://flvplayer-viastream-viasat-tv.origin.vss.viasat.tv/play/swf/player110420.swf",
-      flv => $flv_filename
-  };
-
-
+  return {
+	  rtmp => $rtmp,
+	  swfVfy => "http://flvplayer.viastream.viasat.tv/play/swf/player120328.swf",
+	  flv => $flv_filename
+	 };
 }
 
 1;