[WIP] Reimplement #1652 - switchable time formats#1915
[WIP] Reimplement #1652 - switchable time formats#1915benis wants to merge 4 commits intomixxxdj:masterfrom
Conversation
|
@benis Thank you for jumping in here. Please rebase your work on top of the original commits of @poelzi #1652 It would be also nice if you can sqash your commits and add commit messages describing your work. A rebased version with resolved conflicts is here: |
|
I'm a bit confused.
|
|
Oh, I am sorry I did not explain the whole issue.
We rely on the Git history to track the copyright owner of the source. This is relevant if we ever want to reuse some potions of code with a non GPL 2.0 compatible license. In this case we need to ask the copyright owner for permission. That's why I like to stick with the original commits and commit your changes on top of that.
OK, so it looks like you had unrelated issue like scons cache issues or such? Do you have a clue what actually fixes the issue for you?
It is OK to continue here. I don't care if the original one is still open or not. Since this is almost ready, we can merge it soon anyway and close both PRs in turn.
ASSERTS are for the impossible conditions, just to check if this assumption is true and stays true during the lifetime of the source. In you case the assumption is wrong. So it is either a wrong assumption or we have found a bug. Do you have a clue what is the case in the failing code? |
|
Ok I've had a look at the build issues. The immediate reason #1652 won't build for me is for some reason related to changes that were made to the includes in a completely different PR, #1683. All the build errors I've been seeing relate to files that were changed in that PR. If I apply the changes from that PR on top of the changes in 1652 it builds fine. Obviously when I manually applied the changes to create this PR, those changes were already merged, which explains the discrepancy, but why would I have a problem building this but not you? To checkout the PR I am using |
|
Ping @daschuer. I think I have identified what is causing the test fails and the errors triggered by VERIFY_OR_DEBUG_ASSERT, so I am working on those. Edit: not sure the below actually matters. If you can build this branch then I think we can ignore it.
|
|
Regarding commit 0e0a798, the if statement was checking for the failure condition: |
|
I have just issued #1985 as a rebased version of this. unfortunately the test is still failing: |
|
I assume we use -1 duration for unknown so returning "?" might be reasonable. |
|
Fixed here: #1985 |
|
I will close this now in favor of #1985 |
I've reapplied the changes from #1652 as I could not get that PR to build. I suspect it was changes to other bits of code in the changed files that created an issue, as this PR builds for me.
Things still outstanding:
ifstatements in src/util/duration.cpp be replaced withVERIFY_OR_DEBUG_ASSERT. When I attempted to apply these changes I gotCritical [Main]: DEBUG ASSERT: "dSeconds < 0.0" in function static QString mixxx::DurationBase::formatTime(double, mixxx::DurationBase::Precision) at src/util/duration.cpp:xxerrors at runtime. I don't know what to do about this.