Hey guys,
Sorry, one bug slipped into mixxx-1.7.0-checkExistWhenGettingNext.patch
because in the last minute I changed do...while-loop to while-loop which
works better for this case so there are extra ';' on 2 lines. I attach
the correct patch to this message. I will also modify playHistory patch
to correct the double click action for PLAY_QUEUE-mode in
wtracktableview
Also I'm quite busy this weekend, but next week I have lost more time. I
already installed bazaar and it looks quite straight forward.
Few thigs about the fix patches. Some of them depend on each other on
some level. At least if you apply them in different order patch will
complain about line offset:
--- fixDnD depends on TablemodelIndexPrivacy ---
mixxx-1.7.0-fixTablemodelIndexPrivacy.patch (wtracktablemodel.h)
mixxx-1.7.0-fixDnD.patch (wtracktableview.cpp +76, wtracktableview.h +2)
---
--- Not depending, but affect same file ---
mixxx-1.7.0-fixCueRecallOnNext.patch (track.cpp)
mixxx-1.7.0-fixShowPl.patch (track.cpp +8)
mixxx-1.7.0-fixPlayButton.patch (reader.cpp +1, track.cpp)
---
--- Not depending, but affect same file ---
mixxx-1.7.0-fixPlaylistAppend.patch (track.cpp, wplaylistlistmodel.cpp
mixxx-1.7.0-fixPlaylistsRemove.patch (wplaylistlistmodel.cpp +5,
---
--- Not depending, but affect same file ---
mixxx-1.7.0-fixRateEngine.patch (enginebuffer.cpp +1)
mixxx-1.7.0-fixLoopMode.patch (enginebuffer.cpp)
---
--- Not depending, but affect same file ---
mixxx-1.7.0-fixDirCols.patch (wtracktableview.cpp +1)
mixxx-1.7.0-fixTableViewEditing.patch (wtracktableview.cpp +1)
---
--- These are independent ---
mixxx-1.7.0-fixFlacUnicode.patch (soundsourcesndfile.cpp -1)
mixxx-1.7.0-fixTrComboBox.patch (dlgprefcontrols.cpp)
mixxx-1.7.0-fixSplash.patch (main.cpp +22, mixxx.cpp +12, mixxx.h,
mixxx-1.7.0-fixPLimporterCaseSensitive.patch (trackimporter.cpp)
mixxx-1.7.0-fixQ3textstream.patch (parserm3u.cpp, parserm3u.h,
mixxx-1.7.0-fixM3UparserComment.patch (parserm3u.cpp)
mixxx-1.7.0-fixPlaylistImportName.patch (trackimporter.cpp +3)
mixxx-1.7.0-fixPulseAudio.patch (mixxx.desktop)
---
Features have all been build on top of these bugfixes. And some of them
depend on each other. Look into the ebuild. If you apply them in that
order they will all be applied correctly.
I will also download the 1.8 sources and start looking what is new.
--
-Matti
On Tue, Oct 06, 2009 at 10:35:05AM -0400, Sean M. Pappalardo - D.J. Pegasus
wrote:
> Hello again.
>
> Matti Nykyri wrote:
> > Sounds good... I will look up the wiki. I'm willingful to participate :)
> > We can then think about how this should be done. Please try out the
> > modified version and say your comments.
>
> Mad Jester has started a wiki page for all of us to collaborate on
> integrating your patches: http://www.mixxx.org/wiki/doku.php/mattis_patches
>
> He's also already created a branch off of 1.7 for us to commit your
> patches after testing:
> https://code.launchpad.net/~mixxxdevelopers/mixxx/1.7-matti We're first
> focusing on applying the straightforward bug fixes for 1.7.1.
>
> Also, are you on IRC? The #mixxx channel on Freenode is quite active and
> is where we hang out to discuss changes, ideas, ask for help, etc. We'd
> love for you to join us!
>
> Sincerely,
> Sean M. Pappalardo
> Pegasus/RPG
> "D.J. Pegasus"
--- mixxx-1.7.0.orig/src/track.cpp 2009-10-02 17:51:09.000000000 +0300
+++ mixxx-1.7.0/src/track.cpp 2009-10-02 18:32:24.000000000 +0300
@@ -1270,6 +1270,9 @@
//If the play queue has another song in it, load that...
m_qPlayqueuePlaylist.lock();
//int idx = m_qPlayqueuePlaylist.indexOf(currentTrack);
+ while (!pTrack || !pTrack->checkFileExists())
+ {
+ pTrack = NULL;
if (m_qPlayqueuePlaylist.count() > 0)
pTrack = m_pPlayQueueModel->takeFirst();
else
@@ -1282,6 +1285,7 @@
//Stop playback at the end of the play queue.
//m_pPlayButtonCh1->slotSet(0.);
}
+ }
m_qPlayqueuePlaylist.unlock();
}
else //Load previous track
@@ -1333,6 +1337,9 @@
//If the play queue has another song in it, load that...
m_qPlayqueuePlaylist.lock();
//int idx = m_qPlayqueuePlaylist.indexOf(currentTrack);
+ while (!pTrack || !pTrack->checkFileExists())
+ {
+ pTrack = NULL;
if (m_qPlayqueuePlaylist.count() > 0)
pTrack = m_pPlayQueueModel->takeFirst();
else
@@ -1345,6 +1352,7 @@
//Stop playback at the end of the play queue.
//m_pPlayButtonCh2->slotSet(0.);
}
+ }
m_qPlayqueuePlaylist.unlock();
}
else //Load previous track
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Mixxx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
