glib smart pointers should not be compared to integers.

2 files changed, 52 insertions, 1 deletions

diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 02feb015beb..f89cdb9b8c8 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2015/11/04 01:32:08 agc Exp $
+$NetBSD: distinfo,v 1.29 2017/02/14 21:22:43 joerg Exp $
 
 SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
 RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
@@ -28,3 +28,4 @@ SHA1 (patch-dao_CdrDriver.cc) = b618b4521d010f4153f73a9fab33d5ed56dfb651
 SHA1 (patch-dao_CdrDriver.h) = 71113a5d536aa8eba74e141e612c91e958dadda3
 SHA1 (patch-xdao_CdDevice.cc) = fb83427cef2fc0b7afdb526664f61863cd6bc715
 SHA1 (patch-xdao_CdDevice.h) = 11b9868cc54d2b926e5e588eb467f0941deb1208
+SHA1 (patch-xdao_SampleDisplay.cc) = edca89e680962d5a8add90d87f4ce9854c40d450
diff --git a/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc b/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc
new file mode 100644
index 00000000000..34169adb7bd
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-xdao_SampleDisplay.cc
@@ -0,0 +1,50 @@
+$NetBSD: patch-xdao_SampleDisplay.cc,v 1.1 2017/02/14 21:22:43 joerg Exp $
+
+--- xdao/SampleDisplay.cc.orig	2017-02-09 17:06:36.365008002 +0000
++++ xdao/SampleDisplay.cc
+@@ -768,7 +768,7 @@ bool SampleDisplay::handleLeaveEvent(Gdk
+ void SampleDisplay::redraw(gint x, gint y, gint width, gint height,
+ 			   int drawMask)
+ {
+-  if (pixmap_ == 0)
++  if (!pixmap_)
+     return;
+ 
+   get_window()->draw_drawable(drawGc_, pixmap_, x, y, x, y, width, height);
+@@ -820,7 +820,7 @@ void SampleDisplay::updateSamples()
+ 
+   Toc *toc = tocEdit_->toc();
+ 
+-  if (pixmap_ == 0)
++  if (!pixmap_)
+     return;
+ 
+   gint halfHeight = chanHeight_ / 2;
+@@ -1025,9 +1025,6 @@ void SampleDisplay::updateSamples()
+ 
+ 	}
+ 
+-	if (&pixmap_ == 0)
+-	  std::cout << "null !!" << std::endl;
+-
+ 	if (0 && (gint)di < sampleEndX_) {
+ 	  pos = sampleBuf[len -1].left() * halfHeight;
+ 	  pos /= SHRT_MAX;
+@@ -1084,7 +1081,7 @@ void SampleDisplay::updateSamples()
+ 
+ void SampleDisplay::drawCursor(gint x)
+ {
+-  if (pixmap_ == 0)
++  if (!pixmap_)
+     return;
+ 
+   if (x < sampleStartX_ || x > sampleEndX_)
+@@ -1118,7 +1115,7 @@ void SampleDisplay::drawTimeTick(gint x,
+ {
+   char buf[50];
+ 
+-  if (pixmap_ == 0)
++  if (!pixmap_)
+     return;
+ 
+   unsigned long min = sample / (60 * 44100);