Merge branch 'master' into test_issue_17
This commit is contained in:
		
						commit
						db3a9520e7
					
				| @ -14,13 +14,14 @@ index 3d9debd..cc6240e 100644 | |||||||
| index 5a90eca..8023708 100644
 | index 5a90eca..8023708 100644
 | ||||||
| --- a/driver/manager.c
 | --- a/driver/manager.c
 | ||||||
| +++ b/driver/manager.c
 | +++ b/driver/manager.c
 | ||||||
| @@ -279,7 +279,7 @@
 | @@ -271,6 +271,10 @@
 | ||||||
|      } |          return false; | ||||||
|      else { |  | ||||||
|          printk(KERN_DEBUG "starting playback I/O\n"); |  | ||||||
| -        MuteOutputBuffer(self);
 |  | ||||||
| +        //MuteOutputBuffer(self);
 |  | ||||||
|          self->m_bIsPlaybackIO = true; |  | ||||||
|      } |  | ||||||
|   |   | ||||||
|  |      MTAL_DP("MergingRAVENNAAudioDriver::startIO\n"); | ||||||
|  | +    if (is_playback && self->m_bIsPlaybackIO)
 | ||||||
|  | +        return true;
 | ||||||
|  | +    if (!is_playback && self->m_bIsRecordingIO)
 | ||||||
|  | +        return true;
 | ||||||
|   |   | ||||||
|  |      if (!is_playback) { | ||||||
|  |          printk(KERN_DEBUG "starting capture I/O\n"); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user