apps/mixer.git
4 years agoUpdate autobuild script to create new targets sandbox/DDTLK/autobuild
Frederic Marec [Mon, 2 Dec 2019 14:14:47 +0000 (15:14 +0100)]
Update autobuild script to create new targets

Update autobuild script to create multiple widget target debug, coverage and all

Bug-AGL: SPEC-2049
Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
Change-Id: I0541b22913659415d173ddb39102b55fca56e8ba

4 years agofix autobuild 81/23081/1 8.99.2 8.99.3 8.99.4 8.99.5 icefish/8.99.2 icefish/8.99.3 icefish/8.99.4 icefish/8.99.5 icefish_8.99.2 icefish_8.99.3 icefish_8.99.4 icefish_8.99.5
Li Xiaoming [Thu, 28 Nov 2019 03:07:47 +0000 (04:07 +0100)]
fix autobuild

Bug-AGL: SPEC-2816

Change-Id: I9ac1bf8b3b3409b1e8e1fb108bf9e6795ff5d404
Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
4 years agoMerge "volumeslider: rework of slider layout" 8.99.1 icefish/8.99.1 icefish_8.99.1
Jan-Simon Moeller [Thu, 15 Aug 2019 15:56:56 +0000 (15:56 +0000)]
Merge "volumeslider: rework of slider layout"

4 years agoMerge "cmake: fix compile issue with SDK"
Jan-Simon Moeller [Thu, 8 Aug 2019 17:33:04 +0000 (17:33 +0000)]
Merge "cmake: fix compile issue with SDK"

4 years agovolumeslider: rework of slider layout 86/22086/1
Matt Ranostay [Mon, 5 Aug 2019 18:48:08 +0000 (11:48 -0700)]
volumeslider: rework of slider layout

To avoid text cutoff switch to ColumnLayout instead of rows.

Bug-AGL: SPEC-2711
Change-Id: I490d0e92d6ed89613d8fc7d983f869ab848e8932
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
4 years agocmake: fix compile issue with SDK 85/22085/1
Matt Ranostay [Mon, 5 Aug 2019 18:47:01 +0000 (11:47 -0700)]
cmake: fix compile issue with SDK

To avoid "SkippingbecauseOE_QMAKE_PATH_EXTERNAL_HOST_BINSisnotdefined" error
messages when building with the SDK add the respective path to CMakeLists.txt

Bug-AGL: SPEC-2711
Change-Id: Ie9599d17e48c8a6e31bbecedb8f1d620b470e663
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
4 years agoFix implicit conversions warning 75/22075/2
Li Xiaoming [Mon, 5 Aug 2019 01:07:42 +0000 (09:07 +0800)]
Fix implicit conversions warning

Bug-AGL: SPEC-2422

Change-Id: I75df069462720be45886554baeded4009ca2b39e
Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
4 years agoConvert volume to the [0.0,1.0] range before sending it to audiomixer 94/21794/2 7.99.3 8.0.0 halibut/7.99.3 halibut/8.0.0 halibut_7.99.3 halibut_8.0.0
George Kiagiadakis [Fri, 28 Jun 2019 15:01:05 +0000 (18:01 +0300)]
Convert volume to the [0.0,1.0] range before sending it to audiomixer

Fixes setting the volume.

Bug-AGL: SPEC-2473

Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Change-Id: I9a778b88d58faedb4480a70af749500ae083bc29

4 years agoFix compilation error - m_roles contains QObject* and needs a cast 07/21607/1 7.99.2 halibut/7.99.2 halibut_7.99.2
George Kiagiadakis [Wed, 12 Jun 2019 10:03:21 +0000 (13:03 +0300)]
Fix compilation error - m_roles contains QObject* and needs a cast

Bug-AGL: SPEC-2473

Change-Id: Ia07be3c3b9231b34a8607b430f6f9dfa8ad8b530
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
4 years agoModify mixer to use the new pipewire audiomixer binding 75/21575/4
George Kiagiadakis [Fri, 22 Feb 2019 17:01:22 +0000 (19:01 +0200)]
Modify mixer to use the new pipewire audiomixer binding

Bug-AGL: SPEC-2473

Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Change-Id: I45595d6bde1b710fb81216676c3f8a390f4e5737

5 years agoAdd permission to use display 75/21175/1 7.99.1 halibut/7.99.1 halibut_7.99.1
José Bollo [Fri, 26 Apr 2019 13:52:55 +0000 (15:52 +0200)]
Add permission to use display

Add the permission required to access the display
through the wayland socket.

Change-Id: Idde927b165ac1e15591de499a27a5a8be0df771c
Bug-AGL: SPEC-2357
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
5 years agofix warnings by relocating autobuild scripts 49/20849/1
Raquel Medina [Thu, 28 Mar 2019 13:44:15 +0000 (15:44 +0200)]
fix warnings by relocating  autobuild scripts

- move autobuild scripts to top dir
- remove submodules and update app/CMakeLists.txt
  to use libafb-helpers-qt instead.

Bug-AGL: SPEC-2164

Change-Id: I9bf25a158d4eeba16ffb5555c8ca257cd81259f4
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
5 years agoClean up of Mixer main.cpp 25/20025/2
supriyasirbi [Sat, 9 Feb 2019 15:24:39 +0000 (20:54 +0530)]
Clean up of Mixer main.cpp

This commit is for clean up of Mixer main.cpp to remove the dependencies of homescreen
and qtwindowmanager. It adds AGLExtras to the list of dependencies and simplifies main.cpp.

Bug-AGL: SPEC-2002

Change-Id: I18f974223e4bf45876e5dac045105597f55dd7c6
Signed-off-by: supriyasirbi <supriya.sirbi@gmail.com>
5 years agoAdd some space between the volume sliders 31/19431/1 6.99.4 7.90.0 guppy/6.99.4 guppy_6.99.4 halibut/7.90.0 halibut_7.90.0
Scott Murray [Thu, 3 Jan 2019 06:03:30 +0000 (01:03 -0500)]
Add some space between the volume sliders

The change to a ListView to hold the volume sliders seems to have
resulted in losing any space between them compared to the default
behavior of the previous ColumnLayout scheme.  Setting the ListView
"spacing" parameter restores a bit of space between the sliders to
make them easier to use.

Change-Id: Ie1a21918d529f7ba45cdce009405c63055b7e2e2
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
5 years agoUse Event_ShowWindow instead of Event_TapShortcut 09/18709/10 6.99.3 guppy/6.99.3 guppy_6.99.3
wang_zhiqiang [Wed, 12 Dec 2018 02:46:11 +0000 (10:46 +0800)]
Use Event_ShowWindow instead of Event_TapShortcut

The interface of homescreen service will be changed then,
use Event_ShowWindow instead of Event_TapShortcut.
Related changes:
  agl-service-homescreen: https://gerrit.automotivelinux.org/gerrit/#/c/17929/
  libhomescreen: https://gerrit.automotivelinux.org/gerrit/#/c/17931/
  libqthomescreen: https://gerrit.automotivelinux.org/gerrit/#/c/17933/

BUG-AGL: SPEC-1931

Change-Id: I939d25ea1ca3f78cc18d3c8b4d119c76a77a1ef6
Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
5 years agoReworked the way qml create sliders 17/19017/3
Loïc Collignon [Tue, 18 Dec 2018 16:16:35 +0000 (17:16 +0100)]
Reworked the way qml create sliders

Use the qml MVC to populate a ListView with components based on a template
VolumeSlider. Should now handle potential disconnections, volume changes
by third-party and also fix the issue where sliders are set to 0 at
startup.

Change-Id: I2961d5a1584a121c473ece253faa90a747c64445
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoFix indent using tab instead of spaces 69/18869/1
Loïc Collignon [Thu, 13 Dec 2018 10:37:13 +0000 (11:37 +0100)]
Fix indent using tab instead of spaces

The whole project is using tabs to indent, but mixer.h is using spaces
instead. Fix by using tabs.

Change-Id: Id8ee0a86f027b50c9181d9b9b0af4ed9ee34498e
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoHandle the volume_changed event 65/18865/2
Loïc Collignon [Thu, 13 Dec 2018 08:46:10 +0000 (09:46 +0100)]
Handle the volume_changed event

4A's High Level API now raises event when volume of a role is changed.
This handles it by subscribing to the event and update the corresponding
slider.

Bug: SPEC-2054

Change-Id: I137eaa461f0baa9206ee714c91e3ac998b9b2bf2
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoFix json format changed since v3 61/18261/1 6.99.1 6.99.2 guppy/6.99.1 guppy/6.99.2 guppy_6.99.1 guppy_6.99.2
Loïc Collignon [Fri, 23 Nov 2018 08:38:30 +0000 (09:38 +0100)]
Fix json format changed since v3

Using APIv3 the json format for a response of an API call has changed a
bit, removing one extra useless level.

BUG: SPECT-1973

Change-Id: If5cfcda5740cf48637257a510f030dc84e853057
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoModify graphic role 95/17995/1
Kazumasa Mitsunari [Thu, 15 Nov 2018 11:15:54 +0000 (20:15 +0900)]
Modify graphic role

Window Manager set role name as lower_case,
then change role as lower_case.

Bug-AGL: SPEC-1754

Change-Id: Iac8d9dce808e4683d2541d1ef1ec6e14202c363a
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
5 years agoMerge "delete application_name check in tap_shortcut event"
Jan-Simon Moeller [Fri, 2 Nov 2018 12:27:48 +0000 (12:27 +0000)]
Merge "delete application_name check in tap_shortcut event"

5 years agoMigrate app-templates to CMake module 17/17617/1
Romain Forlot [Wed, 31 Oct 2018 15:46:08 +0000 (16:46 +0100)]
Migrate app-templates to CMake module

Bug-AGL SPEC-1682

Change-Id: I577e0d29b727fc590ff7a83057c60624e59d8d3c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
5 years agodelete application_name check in tap_shortcut event 93/17493/1
wang_zhiqiang [Tue, 30 Oct 2018 09:09:52 +0000 (17:09 +0800)]
delete application_name check in tap_shortcut event

because of now homescreen-service emit event to one application,
delete the applciation_name check.

Bug-AGL: SPEC-1764

Change-Id: I0c02ae85a718dadf228033e5861c6abf62788a82
Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
5 years agoApp's name is in lowercase on TapShortcut event 29/16329/2 5.99.4 5.99.5 5.99.6 6.90.0 flounder/5.99.4 flounder/5.99.5 flounder/5.99.6 flounder_5.99.4 flounder_5.99.5 flounder_5.99.6 guppy/6.90.0 guppy_6.90.0
Loïc Collignon [Fri, 24 Aug 2018 13:01:16 +0000 (15:01 +0200)]
App's name is in lowercase on TapShortcut event

Even if the requested surface is 'Mixer', it is 'mixer' in the
TapShortcut's event argument. So that it doesn't call the activateWindow
to restore it-self if the comparison is not case insensitive.

Bug: SPEC-1653

Change-Id: I086a7bbc92fa1b877aec02c445299015539d6b89
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoRevert "Use appid between homescreen-service and apps" 03/16303/6
Tadao Tanikawa [Fri, 24 Aug 2018 04:47:08 +0000 (04:47 +0000)]
Revert "Use appid between homescreen-service and apps"

This reverts commit 6495b735f39eb8b219deb5d711307869c279e3be.

Bug-AGL: SPEC-1685

Change-Id: If24e4416f9a90dcd53102ee721f00ce193c4fbda
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
5 years agoUse appid between homescreen-service and apps 27/16027/1 5.99.3 flounder/5.99.3 flounder_5.99.3
zheng_wenlong [Mon, 6 Aug 2018 04:35:32 +0000 (13:35 +0900)]
Use appid between homescreen-service and apps

    Use appid between hss and apps, and check event destination in libhomescreen.
    So these is no need compare code when recived Event_TapShortcut Event.

BUG-AGL: SPEC-1645

Change-Id: I79802e624cb420ae400ba8348ad631a11d4157e2
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
5 years agoImprove output of multiple screen resolution 73/15973/1 sandbox/ruke47/flounder_RPi3
Tadao Tanikawa [Thu, 2 Aug 2018 13:11:33 +0000 (13:11 +0000)]
Improve output of multiple screen resolution

To improve output on various monitor with various resolution,
use scale_factor from WM to fit various screen resolution.

Change-Id: I5ef4d54712e405744a9c9d2a369fbb2d0d31716d
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
5 years agoFix issue with QML variable declaration 45/15245/1 5.99.2 flounder/5.99.2 flounder_5.99.2
Loïc Collignon [Tue, 10 Jul 2018 07:43:43 +0000 (09:43 +0200)]
Fix issue with QML variable declaration

It seems that you have to make a local variable to access member, you
can't access a member of a member.

Change-Id: I7ba4918372355d3c3d0f937a6363a1f640d10e41
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoFix compilation and deployment 43/15243/1
Loïc Collignon [Mon, 9 Jul 2018 15:04:57 +0000 (17:04 +0200)]
Fix compilation and deployment

Add CMake definitions so that it use the correct API's version.
XML node in config.xml wasn't correct so that it fails to parse.
The binary should be placed into a bin sub-directory.
Add the missing API import.
Fix the dependency name due to renaming.
Hack the compilation script so that it can find the widget when yocto
and when jenkins (waiting for a fix of the cmake alias in the SDK so
that I can get rid of this script)

Change-Id: Idaff67d8d63b7163deb16766832cf04349eb0237
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoMake volume sliders works correctly 41/15241/1
Loïc Collignon [Thu, 5 Jul 2018 14:13:31 +0000 (16:13 +0200)]
Make volume sliders works correctly

Volume sliders are now binded to the High Level 4a API.

Change-Id: I46c4d80a19cf2a9047a502d9faa8bec6f7bd173e
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoWIP better handling for slider creation 39/15239/1
Loïc Collignon [Thu, 5 Jul 2018 12:30:25 +0000 (14:30 +0200)]
WIP better handling for slider creation

The creation of sliders is now using a template instead of a string
computation.
Also fixed some indentation and trailing spaces issues.

Change-Id: Ieb1d9f953d61fa1bac46bf1ab6904e67d09a3fa9
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoBetter Qt5 handling 37/15237/1
Loïc Collignon [Mon, 2 Jul 2018 13:39:53 +0000 (15:39 +0200)]
Better Qt5 handling

Make use of the correct cmake options to handle Qt correctly.

Change-Id: Ic7c65cb0a51085ec8cb1c0e2e98785a2d41ca0a8
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoAllow to build and run on native linux host 35/15235/1
Loïc Collignon [Mon, 2 Jul 2018 13:38:32 +0000 (15:38 +0200)]
Allow to build and run on native linux host

Make libhomescreen and libmanager dependencies optional so that you can
build, run and debug on a native linux host, to allow faster
development.

Change-Id: Ice0b7e196e9a88dc7f0f8e9894eb9091c6ba566e
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoFix bad autocompletion 33/15233/1
Loïc Collignon [Mon, 2 Jul 2018 13:26:00 +0000 (15:26 +0200)]
Fix bad autocompletion

This fails silently most of the times, but under some conditions nothing
is displayed because of this bad autocompletion mistake.

Change-Id: I96dceb21e0dba21da3120deb8312155a7822f94f
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoUse latest version of conf.d/app-templates submodule. 31/15231/1
Loïc Collignon [Tue, 10 Jul 2018 16:30:55 +0000 (18:30 +0200)]
Use latest version of conf.d/app-templates submodule.

Changes of conf.d/app-templates:

(332f377 - Romain Forlot) Be able to overwrite BUILD_TYPE using CLI
(1ec7531 - Romain Forlot) Use CACHE variable for other common CMAKE variable
(0880356 - Romain Forlot) Fix:: wrong wgt using RELEASE BUILD TYPE
(eec9f07 - Romain Forlot) Fix: SYSROOT location detection... Wrong test.
(291aa4e - Romain Forlot) Change the default debug compilation options.
(22a2cbf - Romain Forlot) Clearer coverage compilation options configuration
(aa68dbd - Romain Forlot) Don't overwrite the autobuild script if it exists
(a13e7b9 - Romain Forlot) Disable the in-tree build method.
(51026d2 - Romain Forlot) Detect Yocto as OS distribution

Change-Id: If5274a0be2a00a0166be8f5c3b6d7a517da821f5
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoUse latest version of afb-helpers submodule. 29/15229/1
Loïc Collignon [Tue, 10 Jul 2018 16:29:00 +0000 (18:29 +0200)]
Use latest version of afb-helpers submodule.

Changes of afb-helpers:

(52f0478 - Jonathan Aillet) Remove unnecessary 'AFB_DEBUG' redefinition
(fc1c62a - Jonathan Aillet) Use binding version to handle dynapi
(5811a53 - Jonathan Aillet) At search, use the prefix parameter as a prefix
(2c29f15 - Loïc Collignon) Remove deprecated use of cmake/Qt macro
(5bec8c5 - Loïc Collignon) Rename method to avoid conflict with Qt's one

Change-Id: Ief77446c27e4c6299c1ba3e82d42a35ecf798e7f
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoFix build failure on master due to afb-helpers 77/14877/1 5.99.1 flounder/5.99.1 flounder_5.99.1
Loïc Collignon [Fri, 29 Jun 2018 14:53:24 +0000 (16:53 +0200)]
Fix build failure on master due to afb-helpers

The afb-helpers submodule do not build anymore on master because of
dynapi change. Added a definition so fix the issue.

Change-Id: Iaf5a1bd58e6628e89af2ec7bab44c188b535e993
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
5 years agoMerge 'eel' into 'master' 31/14731/1
Loïc Collignon [Wed, 27 Jun 2018 15:30:37 +0000 (17:30 +0200)]
Merge 'eel' into 'master'

Replace content from 'master' by content from 'eel' as it's the new
version based on 4a on which new development will be done.

Change-Id: I2966af7dcee59701ff3a344487c008d7e65e68ed
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
6 years agomixer: add clearer pulseaudio control naming 67/12867/2
Matt Ranostay [Wed, 20 Dec 2017 06:39:05 +0000 (22:39 -0800)]
mixer: add clearer pulseaudio control naming

Use the role name for the control name in the Mixer UI instead
of overall vague control description

Bug-AGL: SPEC-1196
Change-Id: I34b5c3378fa3bca7464067490907f9ae0adb6364
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
6 years agoPorting to new HMI Framework 49/11949/1 4.99.3 eel/4.99.3 eel_4.99.3
Scott Murray [Tue, 14 Nov 2017 13:33:09 +0000 (22:33 +0900)]
Porting to new HMI Framework

Changes following guidelines given in "Kickstart: New HMI Framework"
document at:

https://wiki.automotivelinux.org/_media/kickstart_apps_migration_guide.pdf

Change-Id: Iacfb8ad1a6851d0ca9bbcc1815ef5f0822b3836c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
6 years agoFix package name 01/9501/1 3.99.1 4.99.1 4.99.2 dab/3.99.1 dab_3.99.1 eel/4.99.1 eel/4.99.2 eel_4.99.1 eel_4.99.2
Tasuku Suzuki [Wed, 24 May 2017 04:24:22 +0000 (13:24 +0900)]
Fix package name

Change-Id: I97ed87b4e34d971ff918d903c0d40b2d4d46e585
Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
7 years agoAdd support for handling external sink/source volume change events 55/9155/3
Matt Porter [Thu, 20 Apr 2017 16:49:15 +0000 (12:49 -0400)]
Add support for handling external sink/source volume change events

Subscribes to PA volume change events, updating the local cached
volume levels, and propagating the change to the UI. This allows
changes to sink/source volumes levels from the command line (pactl)
or a master volume control to be reflected in the mixer UI controls.

Change-Id: I1d570dffeab9fcf4b6ba51e4792852b44a6149ca
AGL-Bug: SPEC-549
Signed-off-by: Matt Porter <mporter@konsulko.com>
7 years agoFix source volume setting in PaClient::setVolume 51/9151/3
Matt Porter [Thu, 20 Apr 2017 03:39:07 +0000 (23:39 -0400)]
Fix source volume setting in PaClient::setVolume

Fix error resulting in sources not being found due to searching
the sink cache hash.

AGL-Bug: SPEC-548
Change-Id: Icd5a75af7a5fc2e0e125d96910af034e4d0873a3
Signed-off-by: Matt Porter <mporter@konsulko.com>
7 years agoConvert the sink/source volume caches from a list to hashes 41/9141/4
Matt Porter [Wed, 19 Apr 2017 16:53:55 +0000 (12:53 -0400)]
Convert the sink/source volume caches from a list to hashes

Maintain the cached sink/source volume state in separate hashes
for quick lookup. This will further simplify external volume event
support that will need to update the cache.

AGL-Bug: SPEC-548
Change-Id: I47b8e070318f3992a5343d1753c50baa8c1d9cb3
Signed-off-by: Matt Porter <mporter@konsulko.com>
7 years agoRewrite PulseAudio backend into a threaded class 39/9139/3
Matt Porter [Sat, 15 Apr 2017 13:18:25 +0000 (09:18 -0400)]
Rewrite PulseAudio backend into a threaded class

Converts the Mixer PulseAudio backend from a C library to a PaClient
class which runs in its own QThread.  This faciliates isolation of
PaControlModel updates to the QML thread where they belong. It also
provides the foundation for runtime updates of the model and reuse
of the PaClient class in other apps.

AGL-Bug: SPEC-548
Change-Id: I13c4c220fde2fd4bc4aea2e04f39152a963b5fa0
Signed-off-by: Matt Porter <mporter@konsulko.com>
7 years agoAGL-style PulseAudio mixer app 91/7691/2
Matt Porter [Mon, 19 Dec 2016 18:55:11 +0000 (13:55 -0500)]
AGL-style PulseAudio mixer app

Change-Id: I566050a1a8f241f140523df236de81ab951c1394
Signed-off-by: Matt Porter <mporter@konsulko.com>