Closed Fredrum closed 3 years ago
The f91f2a9 commit looks clean, it should work if you just reset --hard to the current chiaki master, then cherry-pick f91f2a9.
Trying to do the reset hard as you suggested. I'm doing this,
git remote set-url origin git@github.com:thestr4ng3r/chiaki.git
git reset --hard origin/master
I get these messages, not sure why my other branch 'rpi01' gets mentioned? (git branch -vv reports 'master')
warning: refname 'origin/master' is ambiguous.
warning: refname 'origin/master' is ambiguous.
HEAD is now at 92cd195 Merge branch 'master' of github.com:Fredrum/chiaki into rpi01
I tried to just 'accept' your edits, but I did the above steps after that and I don't see the accepted edits in my source files so maybe that got reverted?
Luckily I can see the accepted changes so I can just redo them by hand,
I've cleaned it up and added a few changes on top. Be aware that the device called "default" has nothing to do with QAudioDeviceInfo::defaultOutputDevice()
, it's just called like that out of one of the plugins.
I also had to make the fetching of available devices async because it took too long and blocked showing the dialog.
Awesome! Thats great! Yes i know about "default" its a bit odd but equals Alsa on Raspian. There is no device called Alsa. Looking forward to pick this up.
On Nov 20, 2020, at 4:15 AM, Florian Märkl notifications@github.com wrote:
Merged #377 into master.
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.
Hi @thestr4ng3r here's the bits that I just did to add better default handling of Raspian/Linux(?) audio out devices. There's a selection menu in the Settings. I don't know where you'd like to have that menu so just move it or tell me where I should move it to?
Not sure if my Git procedure was better this time? :) Hmm...probably not I only changed 5 files. settings.h .cpp settingsdialog.h .cpp streamsession.cpp
I'm happy to re-do it if this created a bunch of extra work for you?
Cheers, Fred