From: Ralf Ertzinger <ralf@skytale.net>
Date: Tue, 30 Apr 2013 13:51:23 +0000 (+0200)
Subject: Manual merge for DailyMotionGrabber.pm
X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=videosite.git;a=commitdiff_plain;h=afe9b4975a8a82cec484ac15c73e7fd0c3c1dbbf

Manual merge for DailyMotionGrabber.pm
---

afe9b4975a8a82cec484ac15c73e7fd0c3c1dbbf
diff --cc videosite/DailyMotionGrabber.pm
index 3e1e77f,fc1f08c..74e5030
--- a/videosite/DailyMotionGrabber.pm
+++ b/videosite/DailyMotionGrabber.pm
@@@ -16,13 -16,18 +16,15 @@@ use strict
  
  sub new {
      my $class = shift;
 -    my $self = $class->SUPER::new();
 -
 -    $self->{'NAME'} = 'dailymotion';
 -    $self->{_SELFTESTURL} = 'http://www.dailymotion.com/video/xylv6u_moon-duo-sleepwalker_music';
 -    $self->{_SELFTESTTITLE} = 'Moon Duo - Sleepwalker';
 -    $self->{'PATTERNS'} = ['(http://(?:[-a-zA-Z0-9_.]+\.)*dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+))'];
 -
 -    bless($self, $class);
 -
 -    $self->_prepare_parameters();
 -
 -    return $self;
 +    my $self = $class->SUPER::new(
 +        NAME => 'dailymotion',
++        _SELFTESTURL => 'http://www.dailymotion.com/video/xylv6u_moon-duo-sleepwalker_music',
++        _SELFTESTTITLE => 'Moon Duo - Sleepwalker',
 +        PATTERNS => ['(http://(?:[-a-zA-Z0-9_.]+\.)*dailymotion.com/(?:[^/]+/)*video/([-a-zA-Z0-9_]+))'],
 +        @_,
 +    );
 +
 +    return bless($self, $class);
  }
  
  sub _parse {