nuclex-shared-dotnet/Nuclex.Support
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Added XNA 4.0 XBox 360 project; fixed compilation errors that would result from compiling Nuclex.Support on the XBox 360's special compact framework

Browse source 
git-svn-id: file:///srv/devel/repo-conversion/nusu@202 d2e56fa2-650e-0410-a79f-9358c0239efd
This commit is contained in:
Markus Ewald 2010-09-17 01:43:00 +00:00
parent 5f5b8b519b
commit 1aad371ece
17 changed files with 533 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/Tracking/ProgressTracker.cs
View file

@ -196,21 +196,26 @@ namespace Nuclex.Support.Tracking {
lock(this.trackedTransactions) {
// Locate the object to be untracked in our collection
int removeIndex = this.trackedTransactions.FindIndex(
new Predicate<ObservedWeightedTransaction<Transaction>>(
new TransactionMatcher(transaction).Matches
)
);
if(removeIndex == -1) {
int index;
for(index = 0; index < this.trackedTransactions.Count; ++index) {
bool same = ReferenceEquals(
transaction,
this.trackedTransactions[index].WeightedTransaction.Transaction
);
if(same) {
break;
}
}
if(index == this.trackedTransactions.Count) {
throw new ArgumentException("Specified transaction is not being tracked");
}
// Remove and dispose the transaction the user wants to untrack
{
ObservedWeightedTransaction<Transaction> wrappedTransaction =
this.trackedTransactions[removeIndex];
this.trackedTransactions[index];
this.trackedTransactions.RemoveAt(removeIndex);
this.trackedTransactions.RemoveAt(index);
wrappedTransaction.Dispose();
}
@ -228,7 +233,7 @@ namespace Nuclex.Support.Tracking {
// weight would work, too, but we might accumulate rounding errors making the sum
// drift slowly away from the actual value.
float newTotalWeight = 0.0f;
for(int index = 0; index < this.trackedTransactions.Count; ++index)
for(index = 0; index < this.trackedTransactions.Count; ++index)
newTotalWeight += this.trackedTransactions[index].WeightedTransaction.Weight;
this.totalWeight = newTotalWeight;

6
Source/Tracking/Transaction.cs
View file

@ -164,7 +164,13 @@ namespace Nuclex.Support.Tracking {
return true;
}
#if XNA_3
return WaitHandle.WaitOne(timeoutMilliseconds, false);
#elif XBOX360
return WaitHandle.WaitOne(timeoutMilliseconds);
#else
return WaitHandle.WaitOne(timeoutMilliseconds, false);
#endif
}
/// <summary>Whether the transaction has ended already</summary>