Merge branch 'dev'
10 years ago
Authored
GoldenTao# Conflicts:
# Graphics/screenshot.png
# README.md
Parents9cc7a2491dad39
44 files changed
- .gitignore+2−0
- Build/Redists/vcredist_x86.exe——
- EarTrumpet.Interop/AudioDeviceService.cpp+154−0
- EarTrumpet.Interop/AudioDeviceService.h+45−0
- EarTrumpet.Interop/AudioSessionService.cpp+323−307
- EarTrumpet.Interop/AudioSessionService.h+3−1
- EarTrumpet.Interop/EarTrumpet.Interop.vcxproj+117−114
- EarTrumpet.Interop/PolicyConfig.h
+27
−0
EarTrumpet.Interop/exports.cpp+52−1EarTrumpet.sln+31−31EarTrumpet/EarTrumpet.csproj+153−120EarTrumpet/EarTrumpet.iss+7−2EarTrumpet/Extensions/BlurWindowExtensions.cs+1−1EarTrumpet/Extensions/IconExtensions.cs+2−2EarTrumpet/Extensions/InvertableVisibilityConverter.cs+32−0EarTrumpet/Extensions/OpacityConverter.cs+23−0EarTrumpet/Extensions/WindowExtensions.cs+87−71EarTrumpet/MainWindow.xaml+123−29EarTrumpet/MainWindow.xaml.cs+72−5EarTrumpet/Models/EarTrumpetAudioDeviceModel.cs+17−0EarTrumpet/Models/EarTrumpetAudioSessionModel.cs+3−0EarTrumpet/Properties/AssemblyInfo.cs+2−2EarTrumpet/Properties/Resources.Designer.cs+126−108EarTrumpet/Properties/Resources.de.Designer.cs+0−0EarTrumpet/Properties/Resources.de.resx+141−0EarTrumpet/Properties/Resources.fr.resx+141−0EarTrumpet/Properties/Resources.nb-no.Designer.cs+0−0EarTrumpet/Properties/Resources.nb-no.resx+141−0EarTrumpet/Properties/Resources.nn-no.Designer.cs+0−0EarTrumpet/Properties/Resources.nn-no.resx+141−0EarTrumpet/Properties/Resources.resx+140−134EarTrumpet/Services/EarTrumpetAudioDeviceService.cs+85−0EarTrumpet/Services/EarTrumpetAudioSessionService.cs+13−4EarTrumpet/Services/TaskbarService.cs+73−35EarTrumpet/Services/ThemeService.cs+7−3EarTrumpet/Services/UserPreferencesService.cs+1−20EarTrumpet/TrayIcon.cs+49−19EarTrumpet/ViewModels/AppItemViewModel.cs+86−15EarTrumpet/ViewModels/AppItemViewModelComparer.cs+1−1EarTrumpet/ViewModels/AudioMixerViewModel.cs+45−7EarTrumpet/ViewModels/DeviceAppItemViewModel.cs+90−0EarTrumpet/ViewModels/IAudioMixerViewModelCallback.cs+3−0Graphics/screenshot.png——README.md+9−4