Changeset 532

Show
Ignore:
Timestamp:
02/24/09 13:16:27 (9 months ago)
Author:
jdecq
Message:

- Version 3.2 of Flickr Uploadr
- Version 1.9.1 pre-release of XULrunner : multi-threading is real now
- One thread per thumbnail (this is probably too much but a start before using a thread pool)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/MacUploadr.app/Contents/Resources/application.ini

    r529 r532  
    1212Vendor=Flickr 
    1313Name=Flickr Uploadr 
    14 Version=3.1.4 
    15 BuildID=2009021302 
     14Version=3.2 
     15BuildID=2009022401 
    1616Copyright=Copyright (c) 2007-2009 - Yahoo!, Inc. 
    1717ID=uploadr@flickr.com 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/conf.js

    r501 r532  
    109109        // Load are parse the application.ini file 
    110110        load_ini: function(){ 
     111//                      window.openDialog('http://beta2.flickr.com','_blank','modal'); 
    111112 
    112113                var f = Components.classes["@mozilla.org/file/directory_service;1"] 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/photos.js

    r522 r532  
    378378                // Create and show the thumbnail 
    379379        photos.thumb_cancel = false; 
    380 //        threads.workers[id] = Cc['@mozilla.org/thread-manager;1'].getService().newThread(0); 
    381 //              threads.workers[id].dispatch(new Thumb(id, conf.thumb_size, path), 
     380 
     381        threads.workers[id] = Cc['@mozilla.org/thread-manager;1'].getService().newThread(0); 
     382                threads.workers[id].dispatch(new Thumb(id, conf.thumb_size, path), 
     383                        threads.worker.DISPATCH_NORMAL); 
     384         
     385//              threads.worker.dispatch(new Thumb(id, conf.thumb_size, path), 
    382386//                      threads.worker.DISPATCH_NORMAL); 
    383  
    384                 threads.worker.dispatch(new Thumb(id, conf.thumb_size, path), 
    385                         threads.worker.DISPATCH_NORMAL); 
    386387 
    387388                return p; 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/ui.js

    r522 r532  
    421421        upload.cancel = true; 
    422422        try { 
    423 //        for each (var t in threads.workers) { 
    424 //            if(t) { 
    425 //                t.shutdown(); 
    426 //            } 
    427 //        } 
     423          for each (var t in threads.workers) { 
     424              if(t) { 
     425                  t.shutdown(); 
     426              } 
     427          } 
    428428            threads.worker.shutdown(); 
    429429            threads.uploadr.shutdown(); 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/components/flGM.cpp

    r517 r532  
    520520        // Register all video codecs 
    521521        av_register_all(); 
     522 
     523        MagickLib::ExceptionInfo exception; 
     524        const MagickLib::MagickInfo *info; 
     525        GetExceptionInfo(&exception); 
     526        info = GetMagickInfo(NULL, &exception); 
     527 
    522528 
    523529        return NS_OK; 

  • trunk/uploadr/Makefile

    r509 r532  
    221221        @# XULRunner 
    222222        cp $(SRC)/Resources/application.ini $(RES)/ 
     223        cp $(SRC)/Resources/chrome/locale/$(INTL)/updater.ini $(RES)/ 
    223224        cp $(SRC)/Resources/LICENSE.txt $(RES)/ 
    224225ifeq (mac, $(PLATFORM)) 

  • trunk/uploadr/README.updates

    r504 r532  
    1414  http://developer.mozilla.org/en/docs/Mac_OS_X_Build_Prerequisites 
    1515 
     16NEW 
     17        get mozilla-build: http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe 
     18        Open a shell window by running: c:\mozilla-build\start-msvc8.bat 
     19        cd /c 
     20        hg clone http://hg.mozilla.org/mozilla-central mozilla for latest 
     21        hg clone http://hg.mozilla.org/releases/mozilla-1.9.1 mozilla for 1.9.1 
     22OLD 
     23Now checkout and build Mozilla: 
     24  $ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot \ 
     25    co mozilla/client.mk 
     26 
    1627Configure your build, using the UPLOADR/mozconfig file.  Make sure to 
    1728comment the Mac-specific line if you're on Windows: 
    1829  http://developer.mozilla.org/en/docs/Configuring_Build_Options 
     30   
     31  $ cd mozilla 
    1932 
    20 Now checkout and build Mozilla: 
    21   $ cvs -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot \ 
    22     co mozilla/client.mk 
    23   $ cd mozilla 
     33NEW 
     34        hg pull -r default 
     35        hg update   
     36OLD   
    2437  $ make -f client.mk checkout 
     38 
    2539  $ make -f client.mk build 
    2640