Merge lp:~kentb/ubuntu/oneiric/xine-lib/xine-lib-fix-810407 into lp:ubuntu/oneiric/xine-lib

[Kent Baxley]

Fixed the typo mentioned in LP #810407

[Jani Monoses (jani)]

Thanks, I wonder if this should not use quilt (.pc patches) as some other of ubuntu changes do in xine-lib?

[Scott Moser (smoser)]

Hi, Thank you for your interest and help in making ubuntu better.

As Mark and Luke stated in the bug 810407, it generally would be best to fix this in upstream xine and have it trickle down.

Please mark this merge proposal as such, or delete it.

review: Disapprove

Unmerged revisions

88. By Kent Baxley on 2011-07-18

Fixed small typo in src/audio_out/audio_directx2_out (LP #810407)

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-27 20:06:13 +0000
+++ debian/changelog	2011-07-18 22:08:34 +0000
@@ -1,3 +1,9 @@
+xine-lib (1.1.19-2ubuntu7) oneiric; urgency=low
+
+  * Fixed small typo in src/audio_out/audio_directx2_out (LP #810407) 
+
+ -- Kent Baxley <[e-mail]>  Mon, 18 Jul 2011 17:03:52 -0500
+
 xine-lib (1.1.19-2ubuntu6) oneiric; urgency=low
 
   * Tighten dependencies on Libav 0.7

=== modified file 'src/audio_out/audio_directx2_out.c'
--- src/audio_out/audio_directx2_out.c	2009-12-01 13:01:32 +0000
+++ src/audio_out/audio_directx2_out.c	2011-07-18 22:08:34 +0000
@@ -389,7 +389,7 @@
   err = IDirectSoundBuffer_Lock(this->dsbuffer, this->write_pos, size, &ptr1, &size1, &ptr2, &size2, 0);
   /* try to restore the buffer, if necessary */
   if (err == DSERR_BUFFERLOST) {
-    xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, tryig to restore\n"));
+    xine_log(this->class->xine, XINE_LOG_MSG, _(LOG_MODULE ": buffer lost, trying to restore\n"));
     IDirectSoundBuffer_Restore(this->dsbuffer);
   err = IDirectSoundBuffer_Lock(this->dsbuffer, this->write_pos, size, &ptr1, &size1, &ptr2, &size2, 0);  }
   if (err != DS_OK) {