rpm/kmix
SHA256
1
0
Fork 0
forked from pool/kmix
Code Pull Requests Activity

Accepting request 182026 from KDE:Distro:Factory

Browse Source 
Update KDE to KDE 4.10.90

OBS-URL: https://build.opensuse.org/request/show/182026
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmix?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2013-07-08 05:32:01 +00:00 committed by Git OBS Bridge
parent d491fea9a8
commit 98c76b0947
5 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
correct_volume_change_with_mousewheel.diff
View File

@ -1,23 +0,0 @@
diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp
index 3bda22e..fee74d9 100644
--- a/gui/kmixdockwidget.cpp
+++ b/gui/kmixdockwidget.cpp
@@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation)
if ( inc < 1 ) inc = 1;
+ if (delta < 0)
+ inc = -inc;
+
if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780
- delta = -delta;
+ inc = -inc;
- long int cv = inc * (delta / 120 );
+ // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should
+ // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change.
+ //long int cv = inc * (delta / 120 );
+ long cv = inc;
bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted();
kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive;
if ( cv > 0 && isInactive)

3
kmix-4.10.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47fa26839adb83e30a5eb96fa734d8793a1f004e1694d92dba23c8809f7fc7cc
size 381700

3
kmix-4.10.90.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09bb167f8f7a69fa201d10030ef99dc278c220dde73a18b9a7629d133f45ed48
size 383920

16
kmix.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jun 27 18:21:34 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.10.90
* KDE 4.11 Beta 1 release
* See http://www.kde.org/announcements/announce-4.11-beta2.php
-------------------------------------------------------------------
Thu Jun 13 19:29:54 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.10.80
* KDE 4.11 Beta 1 release
* See http://www.kde.org/announcements/announce-4.11-beta1.php
- Dropped correct_volume_change_with_mousewheel.diff, it's included
in this release
-------------------------------------------------------------------
Sat Jun 1 09:46:59 UTC 2013 - tittiatcoke@gmail.com

5
kmix.spec
View File

@ -27,11 +27,9 @@ Summary: Sound Mixer
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Mixers
Url: http://www.kde.org
Version: 4.10.4
Version: 4.10.90
Release: 0
Source0: %{name}-%{version}.tar.xz
#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff tittiatcoke@gmail.com -- Correct the volume change step when done with mousewheel
Patch1: correct_volume_change_with_mousewheel.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@ -40,7 +38,6 @@ KDE's full featured mini mixer
%prep
%setup -q
%patch1 -p1
%build
%cmake_kde4 -d build