Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/audio/win/waveout_output_win.h

Issue 159477: Merge 21613 - Surround Sound handling by folding 5 channels down to stereo.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_util_unittest.cc ('k') | media/audio/win/waveout_output_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/waveout_output_win.h
===================================================================
--- media/audio/win/waveout_output_win.h (revision 21800)
+++ media/audio/win/waveout_output_win.h (working copy)
@@ -86,6 +86,9 @@
// Volume level from 0 to 1.
float volume_;
+ // Channels from 0 to 6.
+ int channels_;
+
// The id assigned by the operating system to the selected wave output
// hardware device. Usually this is just -1 which means 'default device'.
UINT device_id_;
Property changes on: media\audio\win\waveout_output_win.h
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/src/media/audio/win/waveout_output_win.h:r21613
« no previous file with comments | « media/audio/audio_util_unittest.cc ('k') | media/audio/win/waveout_output_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698