Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #6661: Moved content writing from Flush to new method FinalizeContent #8266

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Issue #6661: Moved content writing from Flush to new method FinalizeContent #8266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a703d5
Moved content writing from Flush to new method WriteObject
h3allen Apr 2, 2024
8ff0ab6
Deleted Flush from ContentWriter
h3allen Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentCompiler.cs
View file
Open in desktop
Expand Up @@ -161,7 +161,8 @@ public void Compile(Stream stream, object content, TargetPlatform targetPlatform
{
using (var writer = new ContentWriter(this, stream, targetPlatform, targetProfile, compressContent, rootDirectory, referenceRelocationPath))
{
writer.WriteObject(content);
writer.WriteObject(content);
writer.FinalizeContent();
writer.Flush();
}
}
Expand Down
21 changes: 14 additions & 7 deletions MonoGame.Framework.Content.Pipeline/Serialization/Compiler/ContentWriter.cs
View file
Open in desktop
Expand Up @@ -118,14 +118,14 @@ protected override void Dispose(bool disposing)
}

base.Dispose(disposing);
}
}

/// <summary>
/// All content has been written, so now finalize the header, footer and anything else that needs finalizing.
/// </summary>
public override void Flush()
{
// Write shared resources to the end of body stream
/// </summary>
public void FinalizeContent()
{
// Write shared resources to the end of body stream
WriteSharedResources();

using (var contentStream = new MemoryStream())
Expand Down Expand Up @@ -172,7 +172,14 @@ public override void Flush()
if (compressedStream != null)
compressedStream.Dispose();
}
}
}
}

/// <summary>
/// Clears buffer using BinaryWriter's flush method
/// </summary>
public override void Flush()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this anymore? If it's defaulting to the virtual base call anyways.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If all it's doing is calling the base, then it's not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can certainly go and delete it if it's only calling base and has no other purpose

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted! Apologies for the delay.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not a maintainer so you would need to ping @harry-cpp / @mrhelmut to review the PR(s).

{
base.Flush();
}

Expand Down