OBS User unknown 2008-01-28 00:10:35 +00:00 committed by Git OBS Bridge
parent fd9d37d5a3
commit e8bc6dbed8
5 changed files with 129 additions and 103 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97
size 2887566

3
kaffeine-0.8.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
size 2923224

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Jan 27 08:58:32 CET 2008 - stbinner@suse.de
- update to 0.8.6:
* xine-part: added fastforward/slowmotion dcop calls, escape
special chars, improved seeking, added screen resolution
settings, added nextAudioChannel and nextSubtitleChannel to
player menu dcop calls, fix audio/sub selection
* several DVB fixes and improvements
* CDDA: fixed encoding crash
* kaffeine: requires xine-lib =>1.1.9
-------------------------------------------------------------------
Mon Aug 13 22:28:35 CEST 2007 - coolo@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package kaffeine (Version 0.8.5)
# spec file for package kaffeine (Version 0.8.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -17,12 +17,12 @@ BuildRequires: gstreamer010-plugins-base-devel
%else
BuildRequires: gstreamer-plugins-devel
%endif
URL: http://kaffeine.sourceforge.net/
Url: http://kaffeine.sourceforge.net/
License: GPL v2 or later
Group: Productivity/Multimedia/Video/Players
Summary: Xine-Based Multimedia Player
Version: 0.8.5
Release: 11
Version: 0.8.6
Release: 1
%define rversion %version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
@ -133,6 +133,7 @@ kde_post_install
/opt/kde3/share/services/kaffeineoggvorbis.desktop
/opt/kde3/share/servicetypes/kaffeineaudioencoder.desktop
/opt/kde3/share/servicetypes/kaffeinedvbplugin.desktop
/opt/kde3/share/servicetypes/kaffeineepgplugin.desktop
%files gstreamer
%defattr(-,root,root)
@ -143,31 +144,40 @@ kde_post_install
%endif
%changelog
* Mon Aug 13 2007 - coolo@suse.de
* Sun Jan 27 2008 stbinner@suse.de
- update to 0.8.6:
* xine-part: added fastforward/slowmotion dcop calls, escape
special chars, improved seeking, added screen resolution
settings, added nextAudioChannel and nextSubtitleChannel to
player menu dcop calls, fix audio/sub selection
* several DVB fixes and improvements
* CDDA: fixed encoding crash
* kaffeine: requires xine-lib =>1.1.9
* Mon Aug 13 2007 coolo@suse.de
- don't duplicate the docs between -lang and base pack
* Fri Aug 10 2007 - olh@suse.de
* Fri Aug 10 2007 olh@suse.de
- remove private __u64 declaration, asm/types.h was fixed for -ansi
* Mon Aug 06 2007 - dmueller@suse.de
* Mon Aug 06 2007 dmueller@suse.de
- fix build
* Sun Jul 29 2007 - stbinner@suse.de
* Sun Jul 29 2007 stbinner@suse.de
- update to 0.8.5: several DVB related fixes and enhancements like
* DVB: save/load epg data
* DVB: add a "recall" button, that zap to previous played channel
* DVB: make channel visible and selected after editing.
* DVB: added a search field in channels list
* Wed Jun 06 2007 - stbinner@suse.de
* Wed Jun 06 2007 stbinner@suse.de
- replace playback hint URL also in to be translated text
* Mon Jun 04 2007 - stbinner@suse.de
* Mon Jun 04 2007 stbinner@suse.de
- fix build on older distributions
* Fri Jun 01 2007 - coolo@suse.de
* Fri Jun 01 2007 coolo@suse.de
- move kde_post_install
* Mon May 14 2007 - coolo@suse.de
* Mon May 14 2007 coolo@suse.de
- seperate translations into special package
* Sun Apr 29 2007 - stbinner@suse.de
* Sun Apr 29 2007 stbinner@suse.de
- fix build on 10.0
* Thu Apr 26 2007 - dmueller@suse.de
* Thu Apr 26 2007 dmueller@suse.de
- update dvb data
* Sat Apr 14 2007 - stbinner@suse.de
* Sat Apr 14 2007 stbinner@suse.de
- update to version 0.8.4:
* Playlist: menu option to not auto switch to player window
* DVB: added osd browsing dcop calls
@ -194,7 +204,7 @@ kde_post_install
* Playlist: don't cut bottom font in rollingtitle.
* xine-part: better "Track infos" box layout.
* xine-part: don't restore video settings if not previously saved
* Mon Dec 04 2006 - stbinner@suse.de
* Mon Dec 04 2006 stbinner@suse.de
- update to version 0.8.3:
* DVB: selectAll button in scandialog
* DVB: save channels list sort order
@ -216,17 +226,17 @@ kde_post_install
* DVB: improved device detection.
* DVB: added : "int dvbSNR( int device )" dcop call.
* fixed: crash when quit from systray.
* Mon Nov 27 2006 - stbinner@suse.de
* Mon Nov 27 2006 stbinner@suse.de
- fix one faulty German translation
* Sat Nov 25 2006 - coolo@suse.de
* Sat Nov 25 2006 coolo@suse.de
- fix autoconf setup for translations (#223736)
* Mon Nov 13 2006 - wstephenson@suse.de
* Mon Nov 13 2006 wstephenson@suse.de
- fix DVD playback warning dialog logic
* Mon Nov 13 2006 - wstephenson@suse.de
* Mon Nov 13 2006 wstephenson@suse.de
- fix DVD playback warning URL
* Thu Nov 09 2006 - stbinner@suse.de
* Thu Nov 09 2006 stbinner@suse.de
- fix array subscript out of range (#212476)
* Sat Sep 09 2006 - stbinner@suse.de
* Sat Sep 09 2006 stbinner@suse.de
- update to version 0.8.2:
* fixed: removed statusBar.
* Disc: bigendian fix.
@ -257,15 +267,15 @@ kde_post_install
* DVB: fixed fast zap lock.
* fixed: reduced minimum window size.
* Playlist: autoselect subtitle when unique.
* Thu Aug 24 2006 - stbinner@suse.de
* Thu Aug 24 2006 stbinner@suse.de
- fix ability to switch back to kaffeine player engine (#159367)
* Thu Aug 17 2006 - stbinner@suse.de
* Thu Aug 17 2006 stbinner@suse.de
- fix x-mplayer2.desktop file conflict with kdelibs3
* Fri Jul 21 2006 - schwab@suse.de
* Fri Jul 21 2006 schwab@suse.de
- Quote '&' in subtitle names in playlist [KDE#131180].
* Sun Jun 04 2006 - coolo@suse.de
* Sun Jun 04 2006 coolo@suse.de
- allow Novell translations
* Mon May 15 2006 - stbinner@suse.de
* Mon May 15 2006 stbinner@suse.de
- update to version 0.8.1
* fixed: configure check for cdparanoia.
* Disc: force playing dvd/vcd with engine's default drive if
@ -280,128 +290,128 @@ kde_post_install
* fixed: include qapplication.h instead of qapp.h
* fixed: use memcpy instead of mempcpy(gnu only) in ogg encoder.
* fixed: ogg encoder makefile.
* Mon Apr 10 2006 - jpr@suse.de
* Mon Apr 10 2006 jpr@suse.de
- Improve gstreamer 0.10 by getting visualization to work
* Sun Apr 09 2006 - jpr@suse.de
* Sun Apr 09 2006 jpr@suse.de
- Move gstreamer part to 0.10
* Fri Mar 24 2006 - dmueller@suse.de
* Fri Mar 24 2006 dmueller@suse.de
- fix buffer overflow (#156952, CVE-2006-0051)
* Sat Mar 18 2006 - coolo@suse.de
* Sat Mar 18 2006 coolo@suse.de
- fixed another case of system:/ problem (playing mp3s from CD
would "download" the file first)
* Thu Feb 16 2006 - coolo@suse.de
* Thu Feb 16 2006 coolo@suse.de
- backported SVN fix for system:/ URLs (#150527)
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jan 12 2006 - stbinner@suse.de
* Thu Jan 12 2006 stbinner@suse.de
- Update URL in "DVDs cannot be played" messagebox to working one
- Better check if xine-lib packaged by SUSE is installed
* Sat Oct 22 2005 - schwab@suse.de
* Sat Oct 22 2005 schwab@suse.de
- More finegraned locking.
* Sat Sep 17 2005 - schwab@suse.de
* Sat Sep 17 2005 schwab@suse.de
- Fix missing mutex [#106044].
* Wed Sep 07 2005 - schwab@suse.de
* Wed Sep 07 2005 schwab@suse.de
- Fix undefined operation.
* Tue Sep 06 2005 - adrian@suse.de
* Tue Sep 06 2005 adrian@suse.de
- update to version 0.7.1
* new translations
* crash fix with empty DVB lists in EPG handler
* Mon Sep 05 2005 - adrian@suse.de
* Mon Sep 05 2005 adrian@suse.de
- enable kaffeine kpart again, but do not associate any mimetypes
(#115242)
* Tue Aug 30 2005 - adrian@suse.de
* Tue Aug 30 2005 adrian@suse.de
- disable kaffeine kpart (#11406)
- disable some possible illegal links
- do not create system tray icon by default
* Sun Aug 07 2005 - adrian@suse.de
* Sun Aug 07 2005 adrian@suse.de
- update to version 0.7
* improved DVB support
* optional Gstreamer support via kaffeine-gstreamer package
* media:/ slave support
- remove xine-mad dependency
* Fri Aug 05 2005 - coolo@suse.de
* Fri Aug 05 2005 coolo@suse.de
- some proofreading for our patches
* Wed Mar 30 2005 - adrian@suse.de
* Wed Mar 30 2005 adrian@suse.de
- add czech translation from Klara
* Thu Mar 24 2005 - adrian@suse.de
* Thu Mar 24 2005 adrian@suse.de
- update to version 0.6
* DVB support merged from kaxtv
* Fri Mar 11 2005 - adrian@suse.de
* Fri Mar 11 2005 adrian@suse.de
- remove too late XInitThread() call in kpart, which can cause a
crash (#72072)
* Wed Mar 02 2005 - adrian@suse.de
* Wed Mar 02 2005 adrian@suse.de
- add DVD warning dialog again
* Thu Feb 17 2005 - adrian@suse.de
* Thu Feb 17 2005 adrian@suse.de
- menu entry moved to xdg dir
* Mon Jan 03 2005 - coolo@suse.de
* Mon Jan 03 2005 coolo@suse.de
- fix installation of german man page
* Mon Jan 03 2005 - adrian@suse.de
* Mon Jan 03 2005 adrian@suse.de
- update to version 0.5 final
* Wed Dec 22 2004 - ro@suse.de
* Wed Dec 22 2004 ro@suse.de
- only package english manpage for now
* Wed Nov 10 2004 - adrian@suse.de
* Wed Nov 10 2004 adrian@suse.de
- update to version 0.5rc2
* Wed Oct 06 2004 - adrian@suse.de
* Wed Oct 06 2004 adrian@suse.de
- update to version 0.5rc1
* Wed Sep 29 2004 - adrian@suse.de
* Wed Sep 29 2004 adrian@suse.de
- fix broken desktop file syntax
* Wed Sep 29 2004 - adrian@suse.de
* Wed Sep 29 2004 adrian@suse.de
- fix handling from streams
* Sun Sep 26 2004 - adrian@suse.de
* Sun Sep 26 2004 adrian@suse.de
- adjust mimetypes to KDE 3.3 mimetypes
- remove realplayer support, the Helix plugin is not supported atm.
* Thu Aug 19 2004 - adrian@suse.de
* Thu Aug 19 2004 adrian@suse.de
- use the logo codec file in theora format on SuSE 9.2 and later
* Wed Jun 02 2004 - adrian@suse.de
* Wed Jun 02 2004 adrian@suse.de
- update to version 0.4.3b
* Mon May 03 2004 - adrian@suse.de
* Mon May 03 2004 adrian@suse.de
- update to version 0.4.3
* obsoletes XInitThread patch
* Fri Apr 16 2004 - adrian@suse.de
* Fri Apr 16 2004 adrian@suse.de
- apply crash fix from Helio
* Tue Apr 13 2004 - adrian@suse.de
* Tue Apr 13 2004 adrian@suse.de
- update to version 0.4.2
* Mon Apr 05 2004 - adrian@suse.de
* Mon Apr 05 2004 adrian@suse.de
- update czech translations
* Tue Mar 16 2004 - adrian@suse.de
* Tue Mar 16 2004 adrian@suse.de
- replace logo video. DivX4 won't work with our xine.
* Sat Feb 21 2004 - adrian@suse.de
* Sat Feb 21 2004 adrian@suse.de
- remove Music from Categories
* Mon Jan 19 2004 - adrian@suse.de
* Mon Jan 19 2004 adrian@suse.de
- update to version 0.4.1
* Sun Nov 16 2003 - adrian@suse.de
* Sun Nov 16 2003 adrian@suse.de
- update to final 0.4 version
* Fri Nov 07 2003 - adrian@suse.de
* Fri Nov 07 2003 adrian@suse.de
- fix build
- update to pre-0.4 snapshot
* Wed Oct 01 2003 - adrian@suse.de
* Wed Oct 01 2003 adrian@suse.de
- use --nofork in desktop file or temporary files are get
removed to early
* Sun Sep 21 2003 - adrian@suse.de
* Sun Sep 21 2003 adrian@suse.de
- implement the message box different. It can get translated now
and it solves also a crash in some cases. (#30224)
* Fri Sep 19 2003 - adrian@suse.de
* Fri Sep 19 2003 adrian@suse.de
- from #31052
* fix possible crash on quit
* ask explizit for the "none" audio driver, if "auto" fails.
* Fri Sep 19 2003 - adrian@suse.de
* Fri Sep 19 2003 adrian@suse.de
- add czech translation
* Thu Sep 18 2003 - varkoly@suse.de
* Thu Sep 18 2003 varkoly@suse.de
- add hungarian translation
* Sat Sep 06 2003 - adrian@suse.de
* Sat Sep 06 2003 adrian@suse.de
- higher priority
- fix position change on pause
* Fri Sep 05 2003 - adrian@suse.de
* Fri Sep 05 2003 adrian@suse.de
- justify Categories
* Mon Aug 25 2003 - adrian@suse.de
* Mon Aug 25 2003 adrian@suse.de
- fix configure script to detect libXtest -> no DPMS anymore during
playing
* Sat Aug 23 2003 - adrian@suse.de
* Sat Aug 23 2003 adrian@suse.de
- drop some delete calls, which are reported as invalid by valgrind
seems that fixes the crashes
* Mon Jul 28 2003 - adrian@suse.de
* Mon Jul 28 2003 adrian@suse.de
- use new macro name for %%suse_update_desktop_file
* Mon Jul 28 2003 - adrian@suse.de
* Mon Jul 28 2003 adrian@suse.de
- add Categories
* Wed Jul 16 2003 - adrian@suse.de
* Wed Jul 16 2003 adrian@suse.de
- initial package of version 0.3.2

View File

@ -1,35 +1,38 @@
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -395,9 +395,10 @@
@@ -380,12 +380,13 @@
{
debugOut("xine event: channels changed");
int i,j,channels;
int i,channels;
- char* lang = new char[128];
+ char lang[128];
QString num;
QString slang;
int num;
QStringList tmp;
bool update=false, sk;
+ vw->m_mutex.lock();
vw->m_audioCh.clear();
vw->m_audioCh.append(i18n("auto"));
vw->m_subCh.clear();
@@ -424,8 +425,6 @@
vw->m_subCh << i18n("Ch ") + num.setNum(j+1);
+ vw->m_mutex.lock();
/*** get audio channels ***/
tmp.append(i18n("auto"));
channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
@@ -433,8 +434,6 @@
vw->m_currentSub = num;
}
- delete [] lang;
-
vw->m_currentAudio = xine_get_param(vw->m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL) + 1;
vw->m_currentSub = xine_get_param(vw->m_xineStream, XINE_PARAM_SPU_CHANNEL) + 1;
@@ -444,6 +443,7 @@
//check if stream is seekable
vw->m_trackIsSeekable = (bool)xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_SEEKABLE);
sk = (bool)xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_SEEKABLE);
if ( vw->m_trackIsSeekable!=sk ) {
@@ -442,6 +441,7 @@
vw->m_trackIsSeekable = sk;
}
+ vw->m_mutex.unlock();
QApplication::postEvent(vw, new QTimerEvent(TIMER_EVENT_NEW_CHANNELS));
+ vw->m_mutex.unlock();
if ( update )
QApplication::postEvent(vw, new QTimerEvent(TIMER_EVENT_NEW_CHANNELS));
break;
}
@@ -701,7 +701,9 @@
@@ -705,7 +705,9 @@
}
case TIMER_EVENT_NEW_CHANNELS:
{
@ -41,14 +44,15 @@
case TIMER_EVENT_NEW_TITLE:
--- kaffeine/src/player-parts/xine-part/kxinewidget.h
+++ kaffeine/src/player-parts/xine-part/kxinewidget.h
@@ -47,5 +47,6 @@
@@ -47,6 +47,7 @@
class QTime;
#include <qtimer.h>
+#include <qmutex.h>
#include <qptrlist.h>
#include <qthread.h>
#include <X11/Xlib.h>
#include <xine.h>
@@ -441,6 +442,7 @@
@@ -485,6 +486,7 @@
bool m_trackHasAudio;
bool m_trackHasChapters;
bool m_trackIsSeekable;