MP1-2559 : Don't log 'Environment.StackTrace' when we receive disconnect. TVClient connect/disconnect (couple of fix to handle when channel is null) and force reload setting when connection is back if needed. New method to detect connection from server (Port : 31456). Fix WOL when network card is not already UP. Always try to send WOL Packet on each pass before timeout end loop.
Add CableCARD tuner support. Includes the updated IPTV filter (thanks georgius!).

Squashed commit of the following:

commit d536b4811139d3c8e95d0f330d473d8cb2cbcc7a
Author: mm1352000
Date:   Thu Aug 1 22:50:07 2013 +1200

    Fix for TVE3 IPTV tuner indexing issue.

commit 05cdd81abfc340b9e5e2b9e76ba3280409199df2
Author: mm1352000
Date:   Sat Jul 27 11:52:05 2013 +1200

    Remove default specifier from BaseService constructor. This is a bit bizarre - not sure how I managed to compile locally with this syntax.

commit cf7533f26e8d206636752031bfe6a7f8c9b3dd41
Author: mm1352000
Date:   Sat Jul 27 11:20:23 2013 +1200

    Fix IPTV filter building:
    1. Remove binaries from repo.
    2. Link projects to MP baseclasses rather than external (remove DSHOW_BASE).
    3. Fix compile error in dllmain.cpp after above changes.

commit 7287307622392a369413fadc3914f76c547388bf
Merge: 0654c1f 5acea0a
Author: mm1352000
Date:   Fri Jul 26 00:48:05 2013 +1200

    Merge branch 'EXP-CableCARD_UPnP' of https://github.com/MediaPortal/MediaPortal-1 into EXP-CableCARD_UPnP

commit 0654c1f3b59f8a6e9d5d1720e2d1015b72c36588
Author: mm1352000
Date:   Fri Jul 26 00:40:49 2013 +1200

    Add MP2 UPnP dependencies (from MP2 FIX_UPnP branch) and update the NSI script to install them.

commit 5acea0aecf327dc73b35773fe264da90130f31c1
Author: mm1352000
Date:   Fri Jul 26 00:40:49 2013 +1200

    Add MP2 UPnP dependencies (from MP2 FIX_UPnP branch) and update the NSI script to install them.

commit ae526b59b4a58dae70febf9d588eebc1afc12706
Author: mm1352000
Date:   Wed Jul 24 22:40:03 2013 +1200

    Fix issue with hybrid tuner support: null reference exception caused by null context.

commit 7a6d7237a06dda3c45d9cd550d03d6f5d635bee6
Author: mm1352000
Date:   Tue Jul 23 20:30:26 2013 +1200

    Ensure hybrid devices are marked as hybrid and avoid two lookups on _deviceGroups.

commit 25f31c71900e18646e412f35537948dfa7c20f27
Author: mm1352000
Date:   Mon Jul 22 21:24:27 2013 +1200

    Only attempt to pause streaming when we know that tuner supports it.

commit 8a9f9be3429691b55e5a623e2bbf970a355416bc
Author: mm1352000
Date:   Mon Jul 22 21:00:46 2013 +1200

    Add comment to explain why GetPositionInfo() debug is disabled.

commit 0aa04728171e21b173dedca32ae6ad7ce6eebd06
Author: mm1352000
Date:   Mon Jul 22 20:50:45 2013 +1200

    Fix logging of tuned channel.

commit 4df9f222aa8f13a7af0003b938923f95f2543f08
Author: mm1352000
Date:   Sun Jul 14 11:06:53 2013 +1200

    Fix bug in merging of channels. Because merging may update the number of channels held by the SCTE parser, we must update scteServiceCount for each channel iteration.

commit d324e402980b917a372cb70633837f2f8a197196
Author: mm1352000
Date:   Sun Jul 14 11:03:48 2013 +1200

    Fix signed/unsigned mismatch compile warning in the L-VCT parser.

commit 8caf06d345bd8d88db7911f38aa2d4ace27b259d
Author: mm1352000
Date:   Sun Jul 14 01:45:10 2013 +1200

    Three fixes:
    1. Fix counting of video and audio streams which were not being updated correctly.
    2. Fix handling of multiple strings structures.
    3. Fix debugging of unsupported string compression modes.

commit 45be1bd66bec2a70e869039491346ded19b2a486
Author: mm1352000
Date:   Sun Jul 14 01:37:38 2013 +1200

    Move ATSC/SCTE channel info logging to the channel scanner to avoid spurious logging when merging channels.

commit 0f9e2d890185b08be19d0c0f5eafe6f4080269cd
Author: mm1352000
Date:   Sat Jul 13 13:51:49 2013 +1200

    Fix 3 bugs:
    1. Callback not set on ATSC L-VCT parser leading to VCT not being parsed.
    2. Logic error in L-VCT multiple string parsing.
    3. Attempted interpretation of pathSelect and outOfBand for OTA ATSC VCT. These are cable-only fields.

commit 6bfa3cb7b29d5ed686ad24645a67f8f1e4145abb
Merge: 3b20825 8425629
Author: mm1352000
Date:   Tue Jul 9 20:20:35 2013 +1200

    Merge changes from MP 1.4 final.
    Conflicts related to removal of binaries, new IPTV filter merging (which still has binaries, and addition of C++ baseclasses.

    Conflicts:
    	DirectShowFilters/Filters.sln
    	DirectShowFilters/MPIPTVSource/MPIPTVSource.vcxproj
    	DirectShowFilters/MPIPTVSource/bin/Debug/MPIPTVSource.ax
    	DirectShowFilters/MPIPTVSource/bin/Debug/MPIPTVSource.pdb
    	DirectShowFilters/MPIPTVSource/bin/Release/MPIPTVSource.ax
    	DirectShowFilters/MPIPTVSource/source/mpiptvsource.cpp
    	DirectShowFilters/MPIPTVSource/source/mpiptvsource.h
    	DirectShowFilters/MPIPTVSource/source/setup.cpp
    	DirectShowFilters/TsWriter/bin/Debug/TsWriter.ax
    	DirectShowFilters/TsWriter/bin/Debug/TsWriter.pdb
    	DirectShowFilters/TsWriter/bin/Debug/vc100.pdb
    	DirectShowFilters/TsWriter/bin/Release/TsWriter.ax
    	DirectShowFilters/TsWriter/source/TsWriter.cpp

commit 3b208254aff6278aaeb3f49e79f51f9b30f6a8a4
Author: mm1352000
Date:   Sat Jun 15 15:19:45 2013 +1200

    Remove the MS NP from the graph after using it for detecting tuner type. Otherwise you end up with released COM objects left in the graph - bad!

commit f3363fca41b284732e1a35e56ea98682879fa46a
Author: mm1352000
Date:   Sat Jun 15 15:17:22 2013 +1200

    Tweaks to UPnP device detection:
    1. Start UPnP device detection after BDA/WDM device detection. I was seeing a strange issue in a VM environment where inserting the Prime clear QAM proxy filters seems to have been blocking reception of HTTP/SSDP packets. This caused device detection to be delayed until the Prime NOTIFY packet cycle rolled around.
    2. Apply the device detection delay when the system triggers OnSystemDeviceConnectedOrDisconnected(). I was seeing strange circumstances where TV Server seemed to be blocking the system from properly detecting devices. Hopefully the possibility to delay detection here should fix this.

commit 2358e4ecac920e2cae5819f11a8738fd837a08c4
Author: mm1352000
Date:   Wed Jun 12 02:17:36 2013 +1200

    Don't reuse "card" handlers. In device redetection scenarios this doesn't work so well in practice. Better to dispose the handler and start fresh with a new handler.

commit 69777a20d179f52b45e8c8e043d976904bf1f702
Author: mm1352000
Date:   Mon Jun 10 02:30:06 2013 +1200

    1. Align C++ SCTE and ATSC parser code with C# code.
    2. Where possible, create channels that can be tuned by both CableCARD and clear QAM tuners.

commit 2a86458fe5235e36c271079f7b330c1d181be6ba
Author: mm1352000
Date:   Mon Jun 10 02:18:01 2013 +1200

    More useful scan progress output and logging.

commit 25e2e8018345ed6d9fca0f82962893549547380c
Author: mm1352000
Date:   Mon Jun 10 02:15:58 2013 +1200

    Replace original network ID field with source ID field. There is no such thing as an ONID or NID for ATSC or SCTE. Source ID should uniquely identify a channel, much like a service ID... but it can also be used directly for tuning with a CableCARD.

commit bb72970b246ee1a4eb05c6d66d837c787f3bf849
Author: mm1352000
Date:   Mon Jun 10 02:10:06 2013 +1200

    Minor comment tweak.

commit 7d8ba773bda80d0918631f51670c4e34d44b3498
Author: mm1352000
Date:   Mon Jun 10 02:08:51 2013 +1200

    DRI/UPnP CableCARD scanning changes:
    1. Set provider name for channels.
    2. Handle one vs. two part channel number logic in the L-VCT parser.
    3. Move GetPhysicalChannelFromFrequency() to ATSCChannel.
    4. Tweak NTT parser: isApplication should be applicationType to more closely match SCTE standard field name

commit 2f5a5ab0ed865542ea98e6721164f66808c40580
Author: mm1352000
Date:   Mon Jun 10 01:59:52 2013 +1200

    Tweak CanTune(). Clear QAM and ATSC OTA tuners can only tune channels when the physical channel is set.

commit a6313edab5f0159433cce5a7d873825faeb9f106
Author: mm1352000
Date:   Mon Jun 10 01:58:12 2013 +1200

    Minor debug tweak for CableCARD scanning SI revision detection.

commit 6a68ff6d02431799ca82d3ca0708100074b55035
Author: mm1352000
Date:   Mon Jun 10 01:56:20 2013 +1200

    Minor comment and debug tweak.

commit f678170ab682dbbebc90dc2ed83e34d5dfe0795e
Author: mm1352000
Date:   Mon Jun 10 01:54:38 2013 +1200

    Minor comment and debug tweak.

commit 6cc4a5f5d91e226c41b59ab94e02f1014a681f5b
Author: mm1352000
Date:   Mon Jun 10 01:49:34 2013 +1200

    Add CanTune() override to properly restrict tuning capabilities.

commit c5e5469351f42e4d90af99722c4441bd8fdb136b
Author: mm1352000
Date:   Mon Jun 10 01:48:36 2013 +1200

    Add regions. Required a little bit of code shuffling.

commit a5347618e0c7fb33ac2cfc8079b74a1fd75b95c3
Author: mm1352000
Date:   Mon Jun 10 01:43:04 2013 +1200

    Don't preload tuners that are not enabled.

commit d753168a96fe0778510044d2a1af11e0e104af5c
Author: mm1352000
Date:   Fri May 24 23:11:55 2013 +1200

    Convert/correct the units for bitrate parameters, as per DRI specifications.

commit 0bb66f2ceefe1533c2e3facc67196aae6535470b
Author: mm1352000
Date:   Fri May 24 23:08:24 2013 +1200

    Warn/log when event subscriptions don't succeed.

commit ca3fc04ce1d4871b54f0f97487dfdab3ec368ff3
Author: mm1352000
Date:   Thu May 23 01:00:18 2013 +1200

    Refactor UPnP device detection to try and speed up initial device detection, especially for known devices.

commit 3e91e562fc8be5662d73d1fea231925b1f13723f
Author: mm1352000
Date:   Thu May 23 00:59:19 2013 +1200

    Remove fine/temporary debug.

commit 3feee47ea253e1268929828cc201022ae4920648
Merge: 903408f 1662204
Author: mm1352000
Date:   Tue May 21 21:29:47 2013 +1200

    Merge branch 'FEAT-3774-Rework_MediaPortal_IPTV_Source_Filter' into EXP-CableCARD_UPnP

commit 903408f65464df550fa85cd7fce09e9f97e37404
Author: mm1352000
Date:   Tue May 21 20:38:41 2013 +1200

    Remove DRI data type resolver from TV library project. Should have been removed in previous commit.

commit c1ff6b5e14e906412116511795b61ff6ba03f3f6
Author: mm1352000
Date:   Mon May 20 21:27:12 2013 +1200

    Remove DRI extended data type handler. It should not be required.

commit 650241b00fbd664285d6daf8f79ff3971128902c
Author: mm1352000
Date:   Mon May 20 21:23:41 2013 +1200

    Revert remaining projects to .NET 3.5.

commit 8284c1cb98866fd8869c3cbc7428a0aae6748700
Author: mm1352000
Date:   Mon May 20 21:21:05 2013 +1200

    Use major channel for storing virtual channel number. This allows us to use the same channels for clear QAM and CableCARD tuners.

commit 45ff8ff919ea1d12e763dc2f8d0458b112d0b4ea
Author: mm1352000
Date:   Mon May 20 21:18:01 2013 +1200

    Stylistic improvements.
    1. Don't use Log.WriteFile()
    2. Either log or throw exceptions.
    3. Use TryGetValue() rather than Contains() + [] for dictionary lookups. Saves a lookup.

commit 921fabccc95fc2f98a958177dc20ee3a61ff9682
Author: mm1352000
Date:   Mon May 20 21:11:37 2013 +1200

    Updates to main DRI tuner class.
    1. Try to avoid stealing tuner control from other applications.
    2. Keep the source filter in the graph; no need to switch it in and out.
    3. Fixes for Silicondust tuner compatibility (_isCetonDevice).
    4. Remove .NET 3.5 incompatibilities.

commit 5c0d2bc153c9fd6ae89aedf068fbcf10c98c4e28
Author: mm1352000
Date:   Mon May 20 20:56:25 2013 +1200

    Massive update to scanner classes.
    1. Add scanner class to co-ordinate table parsers.
    2. Add table parser events to inform the scanner when the table parsing is complete.
    3. Determine when tables are complete using a combination of revision detection descriptors (NIT, NTT, S-VCT), section number details (L-VCT, MGT), and alternate logic/assumptions (NIT, S-VCT).
    4. Field interpretation is deferred to the scanner class.
    5. Extract common revision detection logic to base class.
    6. Four byte fields should be stored to unsigned ints, not ints.

commit 97b407b85a09ea00971e53d5e06c5a24f3d22ec5
Author: mm1352000
Date:   Mon May 20 20:14:05 2013 +1200

    Remove Griffin server dependency. morpheus_xx has not had time to complete integration, and the existing HTTP server seems to be working okay.

commit a848cffc361d919b114a1281778002da55da658a
Author: mm1352000
Date:   Mon May 20 20:10:57 2013 +1200

    Add missing BaseService to project.

commit ae021b626773e8e5c872b662af33b3a7ca68658f
Author: mm1352000
Date:   Mon May 20 19:47:36 2013 +1200

    Scan channel 1 rather than channel 2. This has no practical effect but it looks strange to scan channel 2. The scan output really needs to be reworked to be more suitable.

commit 2051b00058d11a8517bb68422decedbc902f4615
Author: mm1352000
Date:   Mon May 20 19:43:01 2013 +1200

    Fix minor RequestTables() missing parameter bug.

commit 52ce086a6bd461d96ff907a4b887c18d774dc58d
Author: mm1352000
Date:   Mon May 20 19:41:51 2013 +1200

    Be properly DRI compatible:
    All state variables of data type "string" SHALL represent hex values with numerals 0-9 and upper case characters A
    â€“ F only (no 0x prefix); separated by comma.

commit 03b1cdef1a36f8bd9247fa508f644f932b0024d4
Author: mm1352000
Date:   Mon May 20 19:37:19 2013 +1200

    Use .NET 3.5 compatible code.

commit 6889c6bb3f56c603d42a3684aee6820142d7bbd7
Author: mm1352000
Date:   Mon May 20 19:27:00 2013 +1200

    Refactor DRI services to use a base class for event subscription/unsubscription and mandatory service implementation checking.

commit 54d699066c08912536f02d2523dd29a26c1c7657
Author: mm1352000
Date:   Mon May 20 19:13:43 2013 +1200

    Use ManagementEventWatcher instead of a background thread to detect BDA/WDM tuner addition/removal.

commit 47bdddf06c07e4f93a57edef7455aa44bfeba001
Author: mm1352000
Date:   Mon May 20 19:03:07 2013 +1200

    DVB base scanning class will not be used for DRI scanning.

commit a822df4f7169a6f060e9db6643e602ab2299d923
Author: mm1352000
Date:   Mon May 20 19:02:09 2013 +1200

    Remove CanTune() modulation restriction in base ATSC tuner class.
    Modulation is a bad way to differentiate between tunable and not tunable channels.

commit bd16efe927c679f1a91d13496a7a7aec265d534a
Author: mm1352000
Date:   Mon May 20 18:55:34 2013 +1200

    1. Minor logging changes with one fix (mismatch log entry placeholder count and values).
    2. Warn and bail if already-present device is redetected.

commit 1662204056899ce599bad9fd7e5a35b8994b4a71
Author: georgius
Date:   Sun May 19 18:21:21 2013 +0200

    preserve in stream only requested stream PID and necessary packets (PAT, PMT, PCR, NULL)

commit b68cb05184cf7af5f4decf0faeb785c094296bc6
Author: georgius
Date:   Sun May 12 13:24:53 2013 +0200

    added option to keep specific stream PIDs in stream

commit 6090003bb54a746414b6744c83a935c00d19a649
Author: mm1352000
Date:   Sun Apr 28 21:24:32 2013 +1200

    Add max payload size configuration to the RTSP plugin to add support for sources that use packet size > 1450 bytes.

commit 847ecedf2ed09553a7c0bec9d5b958b0bd66bec0
Author: mm1352000
Date:   Fri Apr 26 22:12:56 2013 +1200

    Implement C# S-VCT parser. Also added loop iteration logging in all parser error messages.

commit cfee2f3a23f00055b8d84a6518df828ce79b5a95
Author: mm1352000
Date:   Thu Apr 25 20:25:52 2013 +1200

    Implement long form virtual channel table parser.
    There are a few tweaks and bug fixes for the MGT and NTT parser too.

commit b48b5717f912a22241175bd6bdb0ac5909d64b91
Author: mm1352000
Date:   Wed Apr 24 01:44:13 2013 +1200

    Revert .NET 3.5 -> .NET 4.0 changes to project and config files. I didn't intend to commit these.

commit 70e552497fc0704287370d4cca18b2653678c16b
Author: mm1352000
Date:   Wed Apr 24 00:55:18 2013 +1200

    Tuning now works! :)

    Progress:
    1. Implement signal status checking.
    2. Fix hex string format bug in the mux and FDC service, using %x (C++!!!) instead of {0:x} (C#!!!).
    3. Move the service wrappers to their own sub-namespace.
    4. Start to implement PSIP/SI table parsers - L-VCT, S-VCT, MGT, NIT, NTT - for scanning.

commit 486ce245726bb02ba04fa6e5488c653f9a8ce946
Author: mm1352000
Date:   Sat Apr 20 19:48:04 2013 +1200

    Most significant changes:
    1. Fix communication timeout/connection closed issue with delay after subscribing to SV updates. The Ceton hardware/HTTP stack is not very powerful.
    2. Basic MMI message interpretation.
    3. First attempt to implement tuning. Currently not entirely working because RunGraph() fails. However the actual tune command, signal detection and AVTransport play action appear to be working.
    4. Interpret/record state variable changes.

commit f7b38b64dfa80e4baf0f4ab2c735c4d579620365
Author: mm1352000
Date:   Sat Apr 20 19:40:37 2013 +1200

    Fix bug in device detection that caused exception.
    Starting detection before _ourServer is set and _deviceGroups is populated is a bad idea!

commit b92c65d99b93012356f5b196e4be8a8bc16a139b
Author: mm1352000
Date:   Sat Apr 20 19:38:52 2013 +1200

    Add PairingStatus pseudo-enum for security service state variable event interpretation.

commit 72ba449a69f8324b724ebf01da0e972d0cf1b2ab
Author: mm1352000
Date:   Sat Apr 20 19:37:11 2013 +1200

    Fix encoder service field order and input selection allowed values. Upper case is wrong. The DRI specification was a little unclear. ;)

commit 77cd6f919673164bb72324597c821249a3da24c6
Author: mm1352000
Date:   Sat Apr 20 19:34:47 2013 +1200

    Fix 3 CAS service bugs/changes:
    1. CaptureMode allowed values should not be capitalised. The DRI spec was a little unclear. ;)
    2. Add enums for MMI message parsing.
    3. Re-order SetChannel() parameters to workaround MS WMC bug.

commit 8fb32b196cca9c2dd1b504aea9f5fdcffd013807
Author: mm1352000
Date:   Sat Apr 20 19:26:53 2013 +1200

    Fix AVTransport Play() missing parameter bug.

commit cd454c9e2ee15f91f48be08553002eb11f13f568
Author: mm1352000
Date:   Mon Apr 15 00:58:53 2013 +1200

    More testing by adding debug. I've discovered that Ceton has some custom extensions to the DRI, including useful Diag parameters. There are also some issues that need to be raised with Ceton:
    1. They use bps instead of kbps for FDC and Encoder service SVs.
    2. There is some uncertainty over upper/lower case for Encoder parameter values (eg. Higher, Lower, Tuner, Aux).
    3. FDC service GetFdcStatus action returns the PID list as CSV *decimal* values rather than *hex* values. This could also apply to the AddPid and RemovePid actions for FDC and Mux.
    4. AVTransport GetPositionInfo relCount and absCount are set to NOT_IMPLEMENTED. These are meant to be i4 (32 bit integers), so those values are invalid. This is confirmed in the UPnP specs which state they should be set to the max value for i4.

commit 8054a3b74122c1003d8fd9d33a398232f23dfc34
Author: mm1352000
Date:   Sun Apr 14 12:47:09 2013 +1200

    Add device info debug. This allowed a few bugs to be identified in the service wrappers. Bugs have been fixed.

commit ed2cbb113c4c3c9575cf5358600fc985b11c213a
Author: mm1352000
Date:   Tue Apr 9 22:34:51 2013 +1200

    Fix small bug with ConnectionManager GetCurrentConnectionInfo action.

commit 39d2bd41ef5c745729c227d788cc90512aa6dd7d
Author: mm1352000
Date:   Tue Apr 9 22:09:44 2013 +1200

    1. Update comment in IsDifferentTransponder() for ATSCChannel to better explain contents of _physicalChannel and explain why we only compare modulation and phys. channel.

    2. Fix null reference exception in OnDeviceRemoved handler for UPnP detection.

commit 2478cb7c27be51cd301e826e8ba54e4fff1d830a
Author: mm1352000
Date:   Mon Apr 8 00:38:23 2013 +1200

    Intermediate commit.
    Implemented graph building, tidied UPnP device and service stuff. Also implemented logging so that I can see the UPnP logging in the TVE3 logs.

commit f715f3caeb573ff6caa65722e2f41b209e139489
Merge: 40ae9f5 f5e4622
Author: mm1352000
Date:   Mon Apr 8 00:35:21 2013 +1200

    Merge the new DVB-IP filter so we can have RTP stream support.

    Conflicts:
    	DirectShowFilters/Filters.sln
    	TvEngine3/TVLibrary/Setup/setup.nsi

commit 40ae9f59a6c6ff319fceb54f694767eaa20bc943
Author: mm1352000
Date:   Sat Apr 6 14:03:05 2013 +1300

    1. Finished implementation of DRI service wrappers for the MP2 UPnP library.
    2. Moved some files around a little.
    3. Fixed bug in the dynamic device detection. The generic network provider must be removed and reinserted from/into the graph for each device.

    Next step is to integrate the new DVB-IP filter (for the RTP support) and then we start to actually implement support.

commit 64bea1ad4153c838849de41ef2a24b4c4dcfd7bc
Author: mm1352000
Date:   Thu Apr 4 20:15:49 2013 +1300

    Regular ATSC and clear QAM scanning fix from the main branch. Reimplemented rather than merged.

commit 1102f292fcaf372f0bf93f2a380134ad45d96ec4
Author: mm1352000
Date:   Sun Mar 31 16:45:08 2013 +1300

    Implement dynamic device detection, including UPnP OCUR/DRI device detection. Note: to use the MP2 UPnP lib I had to upgrade the projects to .NET 4, but I haven't committed any of these changes except for the TVLibrary and TvLibrary.Interfaces projects since I also added files to those projects.

commit 00acda54c3402ddc7b127fcd9438d9b44821ec33
Author: mm1352000
Date:   Fri Mar 29 18:30:02 2013 +1300

    Minor fix: allow editing of tuning details for encrypted cable (CableCARD) channels. Also clarify the IsDifferentTransponder() logic. We can't use the same tuning detail to tune clear QAM and CableCARD channels because the tuning parameters are totally different. Even if we retrieved the physical channel number and/or frequency from the PSIP for CableCARD channels, we're missing a dedicated field for the virtual channel number.

commit a6637144a439d550f09464ace474b5a59bd8600b
Merge: daa2576 9a1601b
Author: mm1352000
Date:   Fri Mar 29 10:25:04 2013 +1300

    Merge changes from MP 1.3.0 final.

    Conflicts:
    	TvEngine3/TVLibrary/SetupTv/Sections/CardAtsc.cs

commit daa2576ed56342da0a441d69cd73b9bf6405389f
Merge: 61d69f5 5ab1301
Author: mm1352000
Date:   Sat Dec 15 11:22:27 2012 +1300

    Merge changes from MP 1.3 beta.

commit 61d69f588c19e4cc6515638eaf9ceb7e2c66fcbd
Author: mm1352000
Date:   Mon Oct 15 02:02:12 2012 +1300

    Better scanning implementation!
    We only need to scan one channel (rather than 1000+).
    The out-of-band data available from the second tuner filter pin gives us all the basic channel information that we need.
    Receiving this OOB data required adding a second input pin to TsWriter.

commit 0163a0668b1c7714466fb48565effdf4ece191ed
Author: mm1352000
Date:   Thu Oct 4 23:52:32 2012 +1300

    Fix availability of the QAM standard/frequency field - it should only be enabled when "clear QAM" is selected.

commit 0a8c5820aca39714227677365abce35d01e55751
Author: mm1352000
Date:   Thu Oct 4 23:28:31 2012 +1300

    Bug fix - compilation error.

commit 540818dc52884747b060d83bfbe909a39f506161
Author: mm1352000
Date:   Thu Oct 4 23:27:40 2012 +1300

    Add missing class. This is the main class for CableCARD tuner support.

commit aa91ed7b66a28252551be3bf9e971747ee70cbf3
Author: mm1352000
Date:   Thu Oct 4 10:38:44 2012 +1300

    Quick fix for CableCARD tuner detection. We can't rely on the digital cable network type being seen before the ATSC network type. It would be nice to find a better way to resolve this, but for now...

commit e95315175bcaf4fcd8292be4b2239eb4b12fcce2
Author: mm1352000
Date:   Thu Oct 4 02:30:49 2012 +1300

    First rough version of support for CableCARD tuners using PBDA.

commit f5e46223d0e57683261f935f6febf1dadb55a51f
Author: georgius
Date:   Thu Apr 26 20:32:45 2012 +0200

    small fix HTTP protocol

commit 5db0c26aea4c5c432f484fb89de9b05db6acd781
Merge: f66c2be 4e1d6f6
Author: georgius
Date:   Sun Apr 22 13:52:19 2012 +0200

    Merge remote-tracking branch 'remotes/origin/master' into FEAT-3774-Rework_MediaPortal_IPTV_Source_Filter

commit f66c2bee1651fb1a143186781f339eb6befca201
Author: georgius
Date:   Mon Feb 20 17:34:33 2012 +0100

    on dimka request removed Kartina protocol (kartina is based on http and needs external wrapper)

commit 61fe42d4294bb715ec245c00f56bb8f9bb5df725
Merge: 0597730 b016657
Author: georgius
Date:   Wed Jan 18 19:53:54 2012 +0100

    Merge remote-tracking branch 'remotes/origin/master' into FEAT-3774-Rework_MediaPortal_IPTV_Source_Filter

commit 0597730b3de3f6ecaa89cd43511d2a35212f7980
Author: georgius
Date:   Tue Jan 17 18:50:31 2012 +0100

    small fix for HTTP protocol
    small fix for KARTINA protocol
    added builds for debug and release

commit afbcb6c599dc3a402d4a94d7c231bafa790e8101
Author: georgius
Date:   Sun Jan 8 20:11:40 2012 +0100

    fixed default log verbosity (wasn't set when configuration file is not found)
    fixed PID_NULL constant
    changed name of length dump packet file
    removed not necessary logging in HTTP protocol

commit 15d124e21cf1033e5e04bfd5028d20f847d617ec
Author: georgius
Date:   Fri Jan 6 11:59:02 2012 +0100

    fixed stuttering in RTP protocol caused by logging each incoming packet

commit a668ae73098ecbcfa34da941c6bfcf2a7793fded
Author: georgius
Date:   Tue Jan 3 09:43:00 2012 +0100

    merged with master

commit 09d0c40da5156ec27743dc54da8c8dbfee75469f
Merge: 75107d2 4b63e3d
Author: georgius
Date:   Tue Jan 3 09:29:21 2012 +0100

    Merge remote-tracking branch 'remotes/origin/master' into FEAT-3774-Rework_MediaPortal_IPTV_Source_Filter

commit 75107d224d0cccc6ad11dba4a1b15a288488e819
Author: georgius
Date:   Tue Dec 27 07:21:15 2011 +0100

    added possibility to change SID and PID in stream

commit 789a4e2d99c891f104875c52a50481ae1e166578
Merge: 7bd7a6f b3739e5
Author: georgius
Date:   Fri Dec 23 09:46:51 2011 +0100

    Merge remote-tracking branch 'remotes/origin/master' into FEAT-3774-Rework_MediaPortal_IPTV_Source_Filter

commit 7bd7a6fc8378eb1d78c266e4d065992fea52a732
Author: georgius
Date:   Thu Dec 8 08:38:25 2011 +0100

    accepted tourettes comment about NULL packets

commit 1df31c766a1fae9707cf0d3f4012e374c8b8e7eb
Author: georgius
Date:   Wed Dec 7 20:25:31 2011 +0100

    changed install script

commit 52b1c76e98036ad9631a55184adde1c56bfbff7e
Author: georgius
Date:   Wed Dec 7 20:22:33 2011 +0100

    fixed analysing discontinuity in case of MPEG TS packet 0x1FFF
    created common output directory for filter and protocols
    changed install script to handle common output directory

commit 4e37a0cf5cfbd86c40081c7a80f992ed26f86c56
Author: georgius
Date:   Fri Dec 2 17:00:19 2011 +0100

    checking parameters from configuration file
    added logging information from where reading configuration file
    added possibility to dump input packets (needs testing)
    changed configuration file

commit 10c52d3b852ba06b461a7ccb0eb6ed9d0adcaaf2
Author: georgius
Date:   Mon Nov 28 14:14:04 2011 +0100

    moved MediaPortal IPTV Source Filter to separate folder with all protocols
    added debug binaries
    modified install script

commit f4d0e5aa2680b56f6bf74a07b22a787bb19b4241
Author: SilentException
Date:   Mon Nov 28 10:14:16 2011 +0100

    Modified TVE3 setup.nsi to include new IPTV source filter files

commit 71c903f7be636a5c85357e91a98280d657e22e87
Author: georgius
Date:   Thu Nov 24 23:35:44 2011 +0100

    reworked DVB-IP MediaPortal IPTV Source Filter to latest published version with fix for RTP protocol
MP1-4090 : Rework Thumbnail Generation for Video and Picture (Update/Refresh current selected item). Possibility to take title at configured interval. Todo : Remove all new bin and use Nuget.
Merge branch 'MP1-4090-Generation_Thumbnail_for_TV_Movie_based_on_lenght'
Merge remote-tracking branch 'remotes/origin/MP1-2559-Solve_inconsistent_TVService_detection_from_TVServer_in_TVHome'
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB_New_Master

Conflicts:
	TvEngine3/TVLibrary/Setup/setup.nsi
	mediaportal/Core/Util/VideoThumbCreator.cs
	mediaportal/WindowPlugins/GUIPictures/GUIPictures.cs
	mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoFiles.cs