Changeset 4287


Ignore:
Timestamp:
Dec 22, 2007, 6:43:40 PM (14 years ago)
Author:
livings124
Message:

remove ctor from torrent creation and parse functions

Location:
trunk/macosx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r4276 r4287  
    742742        tr_ctor * ctor = tr_ctorNew(fLib);
    743743        tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
    744         if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_EDUPLICATE)
     744        if (tr_torrentParse(fLib, ctor, &info) == TR_EDUPLICATE)
    745745        {
    746746            [self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]];
     
    817817        ctor = tr_ctorNew(fLib);
    818818        tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
    819         canAdd = tr_torrentParseFromCtor(fLib, ctor, &info);
     819        canAdd = tr_torrentParse(fLib, ctor, &info);
    820820        tr_ctorFree(ctor);
    821821       
     
    23372337        tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
    23382338       
    2339         switch (tr_torrentParseFromCtor(fLib, ctor, NULL))
     2339        switch (tr_torrentParse(fLib, ctor, NULL))
    23402340        {
    23412341            case TR_OK:
     
    24992499                ctor = tr_ctorNew(fLib);
    25002500                tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
    2501                 switch (tr_torrentParseFromCtor(fLib, ctor, NULL))
     2501                switch (tr_torrentParse(fLib, ctor, NULL))
    25022502                {
    25032503                    case TR_OK:
     
    25662566                ctor = tr_ctorNew(fLib);
    25672567                tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
    2568                 switch (tr_torrentParseFromCtor(fLib, ctor, NULL))
     2568                switch (tr_torrentParse(fLib, ctor, NULL))
    25692569                {
    25702570                    case TR_OK:
  • trunk/macosx/DragOverlayWindow.m

    r4275 r4287  
    9191            ctor = tr_ctorNew(fLib);
    9292            tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
    93             if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_OK)
     93            if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
    9494            {
    9595                count++;
  • trunk/macosx/Torrent.m

    r4281 r4287  
    14881488    {
    14891489        tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
    1490         if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_OK)
     1490        if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
    14911491        {
    14921492            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
    1493                                         ? fIncompleteFolder : fDownloadFolder;
     1493                                                ? fIncompleteFolder : fDownloadFolder;
    14941494            tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
    14951495           
     
    15011501    {
    15021502        tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
    1503         if (tr_torrentParseFromCtor(fLib, ctor, &info) == TR_OK)
     1503        if (tr_torrentParse(fLib, ctor, &info) == TR_OK)
    15041504        {
    15051505            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
    1506                                         ? fIncompleteFolder : fDownloadFolder;
     1506                                                ? fIncompleteFolder : fDownloadFolder;
    15071507            tr_ctorSetDestination(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
    15081508           
Note: See TracChangeset for help on using the changeset viewer.