← Back to branch summary

~vanvugt/ubuntu/oneiric/mediatomb/fix-770964-784431

« back to all changes in this revision

Viewing changes to src/transcoding/transcode_dispatcher.cc

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia
  • Date: 2009-04-22 21:39:19 UTC
  • mto: (4.2.1 sid)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090422213919-52m015y6gcpv1m1g
Tags: upstream-0.12.0~svn2018
Import upstream version 0.12.0~svn2018

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/transcoding/transcode_dispatcher.cc
7
7
    Copyright (C) 2005 Gena Batyan <bgeradz@mediatomb.cc>,
8
8
                       Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
9
9
    
10
 
    Copyright (C) 2006-2008 Gena Batyan <bgeradz@mediatomb.cc>,
 
10
    Copyright (C) 2006-2009 Gena Batyan <bgeradz@mediatomb.cc>,
11
11
                            Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>,
12
12
                            Leonhard Wimmer <leo@mediatomb.cc>
13
13
    
24
24
    version 2 along with MediaTomb; if not, write to the Free Software
25
25
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
26
26
    
27
 
    $Id: transcode_dispatcher.cc 1698 2008-02-23 20:48:30Z lww $
 
27
    $Id: transcode_dispatcher.cc 2010 2009-01-11 19:10:43Z lww $
28
28
*/
29
29
 
30
30
/// \file transcode_dispatcher.cc
50
50
 
51
51
Ref<IOHandler> TranscodeDispatcher::open(Ref<TranscodingProfile> profile, 
52
52
                                         String location, 
53
 
                                         int objectType, 
 
53
                                         Ref<CdsObject> obj, 
54
54
                                         struct File_Info *info)
55
55
{
56
56
    if (profile == nil)
62
62
    if (profile->getType() == TR_External)
63
63
    {
64
64
        Ref<TranscodeExternalHandler> tr_ext(new TranscodeExternalHandler());
65
 
        return tr_ext->open(profile, location, objectType, info);
 
65
        return tr_ext->open(profile, location, obj, info);
66
66
    }
67
67
    else
68
68
        throw _Exception(_("Unknown transcoding type for profile ") +