- Branch for swift live migrated from ttuki.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-live@25666 001aeff7-3401-0410-a489-f7902fc005dd
- Result of manual merge of https://ttuki.vtt.fi/svn/p2p-next/TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine
  r3329-3669

  i.e., migration of live to Tribler svn.

Original log messages below:

------------------------------------------------------------------------
r3669 | arno | 2012-04-02 15:40:31 +0200 (Mon, 02 Apr 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Made to compile from clean tree.


------------------------------------------------------------------------
r3668 | arno | 2012-04-02 15:18:59 +0200 (Mon, 02 Apr 2012) | 6 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- Clean up

- Final commit on ttuki.


------------------------------------------------------------------------
r3633 | arno | 2012-03-15 16:46:06 +0100 (Thu, 15 Mar 2012) | 3 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/Makefile
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/player.sh
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/source-vlc-http.sh
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/vlc-http-transcode.sh

- New scripts for Linux demo.


------------------------------------------------------------------------
r3398 | arno | 2012-01-11 07:53:56 +0100 (Wed, 11 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


- STL + MS + conditional set erase is not a happy place.


------------------------------------------------------------------------
r3397 | arno | 2012-01-10 17:15:46 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


- Goes nothing.


------------------------------------------------------------------------
r3396 | arno | 2012-01-10 17:09:41 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Friend matters?


------------------------------------------------------------------------
r3395 | arno | 2012-01-10 17:05:44 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Cleanup of channels now done by separate per *Transfer event.


------------------------------------------------------------------------
r3394 | arno | 2012-01-10 16:29:58 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- With channel delete.


------------------------------------------------------------------------
r3393 | arno | 2012-01-10 16:17:55 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Event clean up better.


------------------------------------------------------------------------
r3392 | arno | 2012-01-10 15:45:08 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/send_control.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- Activate clean up.


------------------------------------------------------------------------
r3391 | arno | 2012-01-10 15:39:04 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/send_control.cpp


- Print


------------------------------------------------------------------------
r3390 | arno | 2012-01-10 15:24:03 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- More print.


------------------------------------------------------------------------
r3389 | arno | 2012-01-10 14:51:56 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp


- LIVE != FILE.


------------------------------------------------------------------------
r3385 | arno | 2012-01-10 14:01:33 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Safer event cleanup.


------------------------------------------------------------------------
r3383 | arno | 2012-01-10 11:44:26 +0100 (Tue, 10 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/api.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- Fixes. Testing closing.


------------------------------------------------------------------------
r3377 | arno | 2012-01-09 16:57:51 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- More usage.


------------------------------------------------------------------------
r3376 | arno | 2012-01-09 16:55:58 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/compat.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/hashtree.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Command line cleanup.


------------------------------------------------------------------------
r3375 | arno | 2012-01-09 16:35:24 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- URL parser for swift -i


------------------------------------------------------------------------
r3374 | arno | 2012-01-09 15:50:48 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- No hook-in for source.


------------------------------------------------------------------------
r3373 | arno | 2012-01-09 15:45:18 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/api.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp


- Whazzup?


------------------------------------------------------------------------
r3372 | arno | 2012-01-09 15:30:51 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/transcode15.sh


- For completeness.


------------------------------------------------------------------------
r3371 | arno | 2012-01-09 15:30:28 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/source.sh


- Example code for server that reads from stdin = transcoded MPEGTS from DVB-T.


------------------------------------------------------------------------
r3370 | arno | 2012-01-09 15:26:41 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/live_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- 2 peers can play!


------------------------------------------------------------------------
r3368 | arno | 2012-01-09 14:19:44 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/live_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Second hook-in, appears to work with our vlc.exe (not as picky about MPEGTS sync loss).


------------------------------------------------------------------------
r3367 | arno | 2012-01-09 12:42:43 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Create integral chunks also from file when file = pipe.


------------------------------------------------------------------------
r3366 | arno | 2012-01-09 12:38:15 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Read from pipe fix.


------------------------------------------------------------------------
r3365 | arno | 2012-01-09 12:33:41 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Fast read.


------------------------------------------------------------------------
r3364 | arno | 2012-01-09 12:15:20 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/live_picker.cpp


- C standardization is so wonderful.


------------------------------------------------------------------------
r3363 | arno | 2012-01-09 12:12:52 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/Makefile


- Complete.


------------------------------------------------------------------------
r3362 | arno | 2012-01-09 12:12:35 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/live_picker.cpp


- Forgots.


------------------------------------------------------------------------
r3361 | arno | 2012-01-09 12:09:48 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/api.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/binmap.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/tests/transfertest.cpp


- First attempt at hook-in, moving to Linux for MPEG-TS source.


------------------------------------------------------------------------
r3360 | arno | 2012-01-09 09:45:05 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/compat.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- HTTP data written in chunk-sized blocks gives smooth live playback.


------------------------------------------------------------------------
r3359 | arno | 2012-01-09 09:03:43 +0100 (Mon, 09 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/client.sh
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/server.sh


- Example.


------------------------------------------------------------------------
r3355 | arno | 2012-01-06 17:07:46 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Roughly plays live stream from DVB-T receiver!


------------------------------------------------------------------------
r3354 | arno | 2012-01-06 16:49:20 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


- Smaller blocks for HTTPGW.


------------------------------------------------------------------------
r3353 | arno | 2012-01-06 16:14:03 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp


- UpdatePos fix.


------------------------------------------------------------------------
r3352 | arno | 2012-01-06 16:07:24 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


_ wtf.


------------------------------------------------------------------------
r3351 | arno | 2012-01-06 16:06:46 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


- Wants me Python back.


------------------------------------------------------------------------
r3350 | arno | 2012-01-06 16:04:50 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/api.cpp
   A /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/live.cpp


- Oops.


------------------------------------------------------------------------
r3349 | arno | 2012-01-06 16:01:40 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp


- Testink HTTPGW.


------------------------------------------------------------------------
r3348 | arno | 2012-01-06 15:48:58 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- HTTP input which transfers 40MB file flawlessly.


------------------------------------------------------------------------
r3346 | arno | 2012-01-06 11:31:15 +0100 (Fri, 06 Jan 2012) | 9 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/SConstruct
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h


- Working c/s download!

server>  swift.exe -i bunny.ogg -f storage.dat -l 0.0.0.0:6778 -B
client>  swift.exe -t 127.0.0.1:6778 -e -h e5a12c7ad2d8fab33c699d1e198d66f79fa610c3 -B




------------------------------------------------------------------------
r3343 | arno | 2012-01-06 10:28:48 +0100 (Fri, 06 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/SConstruct
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/compat.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/hashtree.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/tests/connecttest.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/tests/transfertest.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/transfer.cpp


- Compiles.


------------------------------------------------------------------------
r3337 | arno | 2012-01-05 17:33:07 +0100 (Thu, 05 Jan 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/SConstruct
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/cmdgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/statsgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/transfer.cpp


- Refactor into ContentTransfer now compiles.


------------------------------------------------------------------------
r3333 | arno | 2012-01-05 13:25:28 +0100 (Thu, 05 Jan 2012) | 6 lines
Changed paths:
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/cmdgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/seq_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/swift.h
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/tests/transfertest.cpp
   M /TUD/next-share/branches/arno-m48-live/Next-Share/BaseLib/SwiftEngine/transfer.cpp


- Rename of file() to hashtree()

- Dependency of ack_out on FileTransfer.


------------------------------------------------------------------------
r3329 | arno | 2012-01-05 08:01:43 +0100 (Thu, 05 Jan 2012) | 4 lines
Changed paths:
   A /TUD/next-share/branches/arno-m48-live (from /next-share/tags/M48:3328)


- Branch for live.





git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-live@25669 001aeff7-3401-0410-a489-f7902fc005dd
- Branch for merging live into.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27046 001aeff7-3401-0410-a489-f7902fc005dd
Changes in branches riccardo/swift-VoD-merge, arno/swift-mf-seek, arno/swift-like-ftp, arno/swift-multifile and arno/swift-grandtrunk:
- Improved opendir_utf8 and readdir_utf8 to always detect directories
- Removed memory leak when monitoring a directory


git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27049 001aeff7-3401-0410-a489-f7902fc005dd
Added missing statement from previous commit.


git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27050 001aeff7-3401-0410-a489-f7902fc005dd
- Result of svn merge -x --ignore-eol-style -r 25666:27046 https://svn.tribler.org/libswift/branches/arno/swift-live
  
  (reconstructed) and first maintenance.

  2nd attempt.




git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27072 001aeff7-3401-0410-a489-f7902fc005dd
- Parent class of File- and LiveTransfer



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27074 001aeff7-3401-0410-a489-f7902fc005dd
- First part of clean up.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27077 001aeff7-3401-0410-a489-f7902fc005dd
- HTTPGW clean up + added prebuffer.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27080 001aeff7-3401-0410-a489-f7902fc005dd
- Before compile



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27081 001aeff7-3401-0410-a489-f7902fc005dd
- Ready to build.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27082 001aeff7-3401-0410-a489-f7902fc005dd
- Compiles!



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27088 001aeff7-3401-0410-a489-f7902fc005dd
- Straighten.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27090 001aeff7-3401-0410-a489-f7902fc005dd
- Clean up of hs_in: duplicate list of channels.

- TODO: check if Channel::channels still works and
make it (a) non memory leaking
        (b) use secure random channel IDs.




git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27103 001aeff7-3401-0410-a489-f7902fc005dd
- Remark about Channel::channels replacement.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27106 001aeff7-3401-0410-a489-f7902fc005dd
- Download works. Weird C++ casting workaround.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27112 001aeff7-3401-0410-a489-f7902fc005dd
- Zero state and channel cleanup work.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27127 001aeff7-3401-0410-a489-f7902fc005dd
- format string error.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27128 001aeff7-3401-0410-a489-f7902fc005dd
- eol-style correction. 
- zerostate adjusted to live. 



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27130 001aeff7-3401-0410-a489-f7902fc005dd
- Live works again.



git-svn-id: http://svn.tribler.org/libswift/branches/arno/swift-grandtrunk@27131 001aeff7-3401-0410-a489-f7902fc005dd