CVS commit by vriezen:
Updates for 0.8.3rc4
M +9 -0 ChangeLog 1.26
M +1 -1 configure.in.in 1.25
M +1 -1 kmplayer.lsm 1.18
M +6 -0 debian/changelog 1.2
M +2 -3 src/kmplayerpartbase.cpp 1.69
M +6 -5 src/kmplayerprocess.cpp 1.77
--- kdeextragear-2/kmplayer/ChangeLog #1.25:1.26
@@ -1,2 +1,11 @@
+Changes since version 0.8.3-rc3a
+- Downloading of .m3u/.pls also eats .asx, so try to read this one too. This
+ fixes also MPlayer-1.0pre not been able to read .asx files.
+- Make sure if we're downloading a playlist file, it isn't bigger than 50k
+- More or less revert the alsa5/alsa9 change to just alsa. Seems latest
+ MPlayer doesn't work with alsa5/alsa9. Although they are still available.
+Changes since version 0.8.3-rc3
+- add AM_MAINTAINER_MODE in configure.in.in, no recheck/automake/autoconf
+ version mismatch
Changes since version 0.8.3-rc2
- All QtoolTips to QWhatsThis and help from Xine for whatsthis by xine options
--- kdeextragear-2/kmplayer/configure.in.in #1.24:1.25
@@ -1,3 +1,3 @@
-#AM_INIT_AUTOMAKE(kmplayer,0.8.3rc3)
+#AM_INIT_AUTOMAKE(kmplayer,0.8.3rc4)
if test "$build_arts" = "no"; then
--- kdeextragear-2/kmplayer/kmplayer.lsm #1.17:1.18
@@ -1,5 +1,5 @@
Begin3
Title: Kmplayer
-Version: 0.8.3rc3
+Version: 0.8.3rc4
Entered-date:
Description:
--- kdeextragear-2/kmplayer/debian/changelog #1.1:1.2
@@ -1,2 +1,8 @@
+kmplayer (0.8.3rc4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Koos Vriezen <[EMAIL PROTECTED]> Tue, 15 Jul 2004 20:22:37 +0200
+
kmplayer (0.8.3rc3-1) unstable; urgency=low
--- kdeextragear-2/kmplayer/src/kmplayerpartbase.cpp #1.68:1.69
@@ -702,7 +702,6 @@ void KMPlayerSource::play () {
void KMPlayerSource::backward () {
if (m_refurls.size () > 1) {
- m_nexturl = m_currenturl;
- if (m_nexturl != m_refurls.begin ())
- --m_nexturl;
+ if (m_currenturl != m_refurls.begin ())
+ m_nexturl = m_currenturl--;
m_player->process ()->stop ();
} else
--- kdeextragear-2/kmplayer/src/kmplayerprocess.cpp #1.76:1.77
@@ -269,7 +269,7 @@ bool MPlayer::play () {
} else {
int cache = m_configpage->cachesize;
- if (url.protocol () != QString ("dvd") &&
+ if (cache > 3 && url.protocol () != QString ("dvd") &&
url.protocol () != QString ("vcd") &&
- url.protocol () != QString ("tv"))
+ !url.url ().startsWith (QString ("tv://")))
args += QString ("-cache %1 ").arg (cache);
}
@@ -660,5 +660,5 @@ void MPlayerPreferencesPage::read (KConf
config->setGroup (strMPlayerGroup);
additionalarguments = config->readEntry (strAddArgs);
- cachesize = config->readNumEntry (strCacheSize, 0);
+ cachesize = config->readNumEntry (strCacheSize, 384);
alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false);
}
@@ -1116,7 +1116,8 @@ void Xine::initProcess () {
this, SLOT (processOutput (KProcess *, char *, int)));
}
-
+// TODO:input.v4l_video_device_path input.v4l_radio_device_path
+// v4l:/Webcam/0 v4l:/Television/21600 v4l:/Radio/96
bool Xine::play () {
- KURL url (m_source->current ());
+ KURL url (m_source ? m_source->current () : QString ());
if (playing ()) {
if (m_backend) {
