Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into fixes/0.24

Author: jyavenard

mythtv/libs/libmythtv/audioplayer.cpp

@@ -347,11 +347,17 @@ void AudioPlayer::AddAudioData(char *buffer, int len, int64_t timecode)
 {
     if (!m_audioOutput)
         return;
+<<<<<<< HEAD
 
     if (m_parent->PrepareAudioSample(timecode) && !no_audio_out)
         m_audioOutput->Drain();
     int samplesize = m_audioOutput->GetBytesPerFrame();
 
+=======
+    if (m_parent->PrepareAudioSample(timecode) && !no_audio_out)
+        m_audioOutput->Drain();
+    int samplesize = m_channels * AudioOutputSettings::SampleSize(m_format);
+>>>>>>> c81a3d77184738671bfd03f87f27e619189843c3
     if (samplesize <= 0)
         return;
     int frames = len / samplesize;

mythtv/themes/MythCenter-wide/osd.xml

@@ -429,6 +429,22 @@
                 <fill color="#FFFFFF" alpha="255" />
                 <alphapulse min="180" max="255" change="4" />
             </shape>
+            <shape name="cuttoright">
+                <area>0,4,3,30</area>
+                <fill color="#FF0000" alpha="255" />
+            </shape>
+            <shape name="cuttoleft">
+                <area>0,4,3,30</area>
+                <fill color="#FF0000" alpha="255" />
+            </shape>
+            <shape name="keeptoright">
+                <area>0,4,3,30</area>
+                <fill color="#00FF00" alpha="255" />
+            </shape>
+            <shape name="keeptoleft">
+                <area>0,4,3,30</area>
+                <fill color="#00FF00" alpha="255" />
+            </shape>
         </editbar>
     </window>