[Pkg-kde-commits] rev 2468 -
trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Nov 30 22:06:37 UTC 2005
Author: chrsmrtn
Date: 2005-11-30 22:06:36 +0000 (Wed, 30 Nov 2005)
New Revision: 2468
Added:
trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484464.diff
Log:
branch pull for kdemultimedia.
Added: trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484464.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484464.diff 2005-11-30 20:11:04 UTC (rev 2467)
+++ trunk/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r484464.diff 2005-11-30 22:06:36 UTC (rev 2468)
@@ -0,0 +1,354 @@
+#DPATCHLEVEL=0
+--- mpeglib/lib/mpegplay/mmxidct_asm.S (.../tags/KDE/3.5.0/kdemultimedia) (revision 484464)
++++ mpeglib/lib/mpegplay/mmxidct_asm.S (.../branches/KDE/3.5/kdemultimedia) (revision 484464)
+@@ -6,7 +6,7 @@
+ */
+
+ IDCT_mmx_dummy:
+-
++ .section .note.GNU-stack,"", at progbits
+ #endif
+
+
+--- kscd/kscd.cpp (.../tags/KDE/3.5.0/kdemultimedia) (revision 484464)
++++ kscd/kscd.cpp (.../branches/KDE/3.5/kdemultimedia) (revision 484464)
+@@ -130,6 +130,9 @@
+ // the volume slider
+ volumeIcon->setPixmap(SmallIcon("player_volume"));
+ volumeSlider->setValue(Prefs::volume());
++ QString str;
++ str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) );
++ volumelabel->setText(str);
+ connect(volumeSlider, SIGNAL(valueChanged(int)), SLOT(volChanged(int)));
+
+ /* FIXME check for return value */
+@@ -137,6 +140,7 @@
+ connect(m_cd, SIGNAL(trackPlaying(unsigned, unsigned)), this, SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, SIGNAL(trackPaused(unsigned, unsigned)), this, SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, SIGNAL(trackChanged(unsigned, unsigned)), this, SLOT(trackChanged(unsigned, unsigned)));
++ connect(m_cd, SIGNAL(discStopped()), this, SLOT(discStopped()));
+ connect(m_cd, SIGNAL(discChanged(unsigned)), this, SLOT(discChanged(unsigned)));
+ connect( &queryledtimer, SIGNAL(timeout()), SLOT(togglequeryled()) );
+ connect( &titlelabeltimer, SIGNAL(timeout()), SLOT(titlelabeltimeout()) );
+@@ -377,8 +381,6 @@
+
+ if (!m_cd->isPlaying())
+ {
+- setLEDs(0);
+- resetTimeSlider(true);
+ kapp->processEvents();
+ kapp->flushX();
+
+@@ -389,6 +391,9 @@
+ }
+ else
+ {
++ setLEDs(0);
++ resetTimeSlider(true);
++
+ if(Prefs::randomPlay())
+ {
+ make_random_list();
+@@ -424,6 +429,9 @@
+ {
+ if (shuffle == 2) {
+ if(Prefs::randomPlay() && m_cd->tracks() > 0) {
++ shufflePB->blockSignals(true);
++ shufflePB->setOn(true);
++ shufflePB->blockSignals(false);
+ make_random_list(); /* koz: Build a unique, once, random list */
+ if(m_cd->isPlaying())
+ nextClicked();
+@@ -459,7 +467,7 @@
+
+ if (Prefs::randomPlay()) {
+ track = prev_randomtrack();
+- if (track == 0) {
++ if (track == -1) {
+ return;
+ }
+ } else {
+@@ -476,7 +484,7 @@
+
+ kapp->processEvents();
+ kapp->flushX();
+- m_cd->play(track, playlist.isEmpty() ? 0 : track);
++ m_cd->play(track, 0, playlist.isEmpty() ? 0 : track);
+ } // prevClicked()
+
+ bool KSCD::nextClicked()
+@@ -504,7 +512,7 @@
+
+ kapp->processEvents();
+ kapp->flushX();
+- m_cd->play(track, playlist.isEmpty() ? 0 : track + 1);
++ m_cd->play(track, 0, Prefs::randomPlay() || !playlist.isEmpty() ? track + 1 : 0);
+ return true;
+ } // nextClicked()
+
+@@ -554,25 +562,25 @@
+ } //trackChanged(int track)
+
+
+-void KSCD::jumpToTime(int seconds, bool forcePlay)
++void KSCD::jumpToTime(int ms, bool forcePlay)
+ {
+ kapp->processEvents();
+ kapp->flushX();
+
+ int track = m_cd->track();
+ if ((m_cd->isPlaying() || forcePlay) &&
+- seconds < (int)m_cd->trackLength())
++ ms < (int)m_cd->trackLength())
+ {
+ if(Prefs::randomPlay() || !playlist.isEmpty())
+ {
+- m_cd->play(track, seconds, track + 1);
++ m_cd->play(track, ms, track + 1);
+ }
+ else
+ {
+- m_cd->play(track, seconds);
++ m_cd->play(track, ms);
+ }
+ }
+-} // jumpToTime(int seconds)
++} // jumpToTime(int ms)
+
+ void KSCD::timeSliderPressed()
+ {
+@@ -783,21 +791,14 @@
+ void KSCD::setDevicePaths()
+ {
+ if (!m_cd->setDevice(Prefs::cdDevice(), Prefs::volume(), Prefs::digitalPlayback(),
+- Prefs::audioSystem(), Prefs::audioDevice()))
++ Prefs::audioSystem(), Prefs::audioDevice()))
+ {
+ // This device did not seem usable.
+ QString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\
+ "Please make sure you have access permissions to:\n%1").arg(
+- KCompactDisc::urlToDevice(Prefs::cdDevice()));
++ KCompactDisc::urlToDevice(Prefs::cdDevice()));
+ KMessageBox::error(this, str, i18n("Error"));
+ }
+- else
+- {
+- if (Prefs::autoplay() && !m_cd->isPlaying())
+- {
+- playClicked();
+- }
+- }
+ } // setDevicePath()
+
+ void KSCD::setDocking(bool dock)
+@@ -854,7 +855,7 @@
+ void KSCD::volChanged( int vol )
+ {
+ QString str;
+- str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) );
++ str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), vol) );
+ volumelabel->setText(str);
+ m_cd->setVolume(vol);
+ Prefs::setVolume(vol);
+@@ -930,7 +931,6 @@
+ {
+ if(!Prefs::looping())
+ {
+- m_cd->stop();
+ return -1;
+ }
+ else
+@@ -1000,6 +1000,11 @@
+ //totaltimelabel->clear();
+ totaltimelabel->lower();
+
++ if (Prefs::autoplay() && !m_cd->isPlaying())
++ {
++ playClicked();
++ }
++
+ // We just populated the GUI with what we got from the CD. Now look for
+ // more from the Internet...
+ lookupCDDB();
+@@ -1007,12 +1012,31 @@
+
+ void KSCD::discStopped()
+ {
+- statuslabel->setText(i18n("Stopped"));
+ if (Prefs::ejectOnFinish() && !stoppedByUser && (m_cd->discId() != KCompactDisc::missingDisc))
+ {
+ ejectClicked();
+ }
+
++ if (!stoppedByUser)
++ {
++ if (Prefs::randomPlay())
++ {
++ // If nextClicked returns false, it was the last
++ // random track, and the player should be stopped
++ if (nextClicked())
++ return;
++ }
++ else if (Prefs::looping())
++ {
++ playClicked();
++ return;
++ }
++ }
++
++ statuslabel->setText(i18n("Stopped"));
++ playPB->setText(i18n("Play"));
++ playPB->setIconSet(SmallIconSet("player_play"));
++
+ /* reset to initial value, only stopclicked() sets this to true */
+ stoppedByUser = false;
+
+@@ -1332,10 +1356,13 @@
+ tmp = trackPosition;
+ break;
+ }
+- setLEDs(tmp);
+- timeSlider->blockSignals(true);
+- timeSlider->setValue(trackPosition);
+- timeSlider->blockSignals(false);
++ if (updateTime)
++ {
++ setLEDs(tmp);
++ timeSlider->blockSignals(true);
++ timeSlider->setValue(trackPosition);
++ timeSlider->blockSignals(false);
++ }
+ }
+
+ void KSCD::cycleplaytimemode()
+--- kscd/libwm/cdrom.c (.../tags/KDE/3.5.0/kdemultimedia) (revision 484464)
++++ kscd/libwm/cdrom.c (.../branches/KDE/3.5/kdemultimedia) (revision 484464)
+@@ -344,7 +344,7 @@
+ return -1;
+ } else {
+ wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS,
+- "gen_det_drive_status returns status %s, track %i, frame %i\n",
++ "gen_get_drive_status returns status %s, track %i, frame %i\n",
+ gen_status(mode), thiscd.curtrack, cur_frame);
+ }
+
+@@ -508,8 +508,8 @@
+
+ cur_firsttrack = start;
+ cur_lasttrack = end;
+-
+- wm_cd_play_chunk(thiscd.trk[CARRAY(start)].start + pos * 75, end = thiscd.ntracks ?
++
++ wm_cd_play_chunk(thiscd.trk[CARRAY(start)].start + pos * 75, end == thiscd.ntracks ?
+ thiscd.length * 75 : thiscd.trk[CARRAY(end)].start - 1, thiscd.trk[CARRAY(start)].start);
+ /* So we don't update the display with the old frame number */
+ wm_cd_status();
+--- kscd/kcompactdisc.cpp (.../tags/KDE/3.5.0/kdemultimedia) (revision 484464)
++++ kscd/kcompactdisc.cpp (.../branches/KDE/3.5/kdemultimedia) (revision 484464)
+@@ -70,6 +70,7 @@
+ #include "libwm/include/wm_cdtext.h"
+ #include "libwm/include/wm_config.h"
+ #include "libwm/include/wm_cdinfo.h"
++#include "libwm/include/wm_helpers.h"
+
+ // Sun, Ultrix etc. have a canonical CD device specified in the
+ // respective plat_xxx.c file. On those platforms you need not
+@@ -109,7 +110,7 @@
+ m_infoMode(infoMode)
+ {
+ // Debug.
+- // wm_cd_set_verbosity(0xffff);
++ // wm_cd_set_verbosity(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS_ALL );
+ m_trackArtists.clear();
+ m_trackTitles.clear();
+ m_trackStartFrames.clear();
+@@ -217,7 +218,7 @@
+
+ bool KCompactDisc::isPlaying() const
+ {
+- return WM_CDS_DISC_PLAYING(m_status) && (m_status != WM_CDM_PAUSED);
++ return WM_CDS_DISC_PLAYING(m_status) && (m_status != WM_CDM_PAUSED) && (m_status != WM_CDM_TRACK_DONE);
+ }
+
+ void KCompactDisc::pause()
+@@ -243,12 +244,12 @@
+ if (!reply.isValid() || properties.count() < 6)
+ {
+ kdError() << "Invalid reply from mediamanager" << endl;
+- return defaultDevice;
++ return defaultDevice;
+ }
+ else
+ {
+ kdDebug() << "Reply from mediamanager " << properties[5] << endl;
+- return properties[5];
++ return properties[5];
+ }
+ }
+
+@@ -293,10 +294,13 @@
+ // Init CD-ROM and display.
+ setVolume(volume);
+ }
++
++ m_previousStatus = m_status = wm_cd_status();
++
+ if (m_infoMode == Asynchronous)
+ timerExpired();
+ else
+- timer.start(1000, true);
++ timer.start(1000, true);
+ return m_device != QString::null;
+ }
+
+@@ -373,6 +377,7 @@
+ void KCompactDisc::timerExpired()
+ {
+ m_status = wm_cd_status();
++
+ if (WM_CDS_NO_DISC(m_status) || (m_device == QString::null))
+ {
+ if (m_previousStatus != m_status)
+@@ -445,14 +450,13 @@
+ }
+ if (isPlaying())
+ {
++ m_previousStatus = m_status;
+ // Update the current playing position.
+ emit trackPlaying(m_track, trackPosition());
+ }
+ else
+ if (m_previousStatus != m_status)
+ {
+- m_previousStatus = m_status;
+-
+ // If we are not playing, then we are either paused, or stopped.
+ switch (m_status)
+ {
+@@ -463,9 +467,15 @@
+ emit trayOpening();
+ break;
+ default:
+- emit discStopped();
++ if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED
++ && m_status == WM_CDM_STOPPED)
++ {
++ emit discStopped();
++ }
+ break;
+ }
++
++ m_previousStatus = m_status;
+ }
+ }
+
+--- kscd/kscd.kcfg (.../tags/KDE/3.5.0/kdemultimedia) (revision 484464)
++++ kscd/kscd.kcfg (.../branches/KDE/3.5/kdemultimedia) (revision 484464)
+@@ -65,6 +65,7 @@
+ </entry>
+ <entry name="AudioDevice" type="String">
+ <label>The audio device KsCD uses.</label>
++ <default>/dev/cdrom</default>
+ </entry>
+ <entry name="DigitalPlayback" type="Bool">
+ <label>Use direct digital playback.</label>
More information about the pkg-kde-commits
mailing list