[gnome-dvb-daemon] Use this instead of base in Channel subclasses



commit 644c46583e4d57730b9f3688130dd341834a0dd6
Author: Sebastian PÃlsterl <sebp k-d-w org>
Date:   Thu Sep 29 21:25:32 2011 +0200

    Use this instead of base in Channel subclasses
    
    This is a work-around for https://bugzilla.gnome.org/show_bug.cgi?id=659863

 src/Cable/CableChannel.vala             |    4 ++--
 src/Satellite/SatelliteChannel.vala     |    4 ++--
 src/Terrestrial/TerrestrialChannel.vala |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Cable/CableChannel.vala b/src/Cable/CableChannel.vala
index 6d9a8eb..d7b94aa 100644
--- a/src/Cable/CableChannel.vala
+++ b/src/Cable/CableChannel.vala
@@ -44,7 +44,7 @@ namespace DVB {
         }
         
         public override string to_string () {
-            return "%s:%u:%s:%u:%s:%s:%u:%s:%u".printf(base.Name, base.Frequency,
+            return "%s:%u:%s:%u:%s:%s:%u:%s:%u".printf(this.Name, this.Frequency,
                 Utils.get_nick_from_enum (typeof(DvbSrcInversion),
                                           this.Inversion),
                 this.SymbolRate * 1000,
@@ -52,7 +52,7 @@ namespace DVB {
                                           this.CodeRate),
                 Utils.get_nick_from_enum (typeof(DvbSrcModulation),
                                           this.Modulation),
-                base.VideoPID, base.get_audio_pids_string (), base.Sid);
+                this.VideoPID, this.get_audio_pids_string (), this.Sid);
         }
     
     }
diff --git a/src/Satellite/SatelliteChannel.vala b/src/Satellite/SatelliteChannel.vala
index cd5fd30..6b387b1 100644
--- a/src/Satellite/SatelliteChannel.vala
+++ b/src/Satellite/SatelliteChannel.vala
@@ -47,9 +47,9 @@ namespace DVB {
         }
         
         public override string to_string () {
-            return "%s:%u:%s:%d:%u:%u:%s:%u".printf(base.Name, base.Frequency,
+            return "%s:%u:%s:%d:%u:%u:%s:%u".printf(this.Name, this.Frequency,
                 this.Polarization, this.DiseqcSource, this.SymbolRate,
-                base.VideoPID, base.get_audio_pids_string (), base.Sid);
+                this.VideoPID, this.get_audio_pids_string (), this.Sid);
         }
     }
 
diff --git a/src/Terrestrial/TerrestrialChannel.vala b/src/Terrestrial/TerrestrialChannel.vala
index cbec164..f429649 100644
--- a/src/Terrestrial/TerrestrialChannel.vala
+++ b/src/Terrestrial/TerrestrialChannel.vala
@@ -53,7 +53,7 @@ namespace DVB {
         }
         
         public override string to_string () {
-            return "%s:%u:%s:%s:%s:%s:%s:%s:%s:%s:%u:%s:%u".printf(base.Name, base.Frequency,
+            return "%s:%u:%s:%s:%s:%s:%s:%s:%s:%s:%u:%s:%u".printf(this.Name, this.Frequency,
                 Utils.get_nick_from_enum (typeof(DvbSrcInversion),
                                           this.Inversion),
                 Utils.get_nick_from_enum (typeof(DvbSrcBandwidth),
@@ -70,7 +70,7 @@ namespace DVB {
                                           this.GuardInterval),
                 Utils.get_nick_from_enum (typeof(DvbSrcHierarchy),
                                           this.Hierarchy),
-                base.VideoPID, base.get_audio_pids_string (), base.Sid);
+                this.VideoPID, this.get_audio_pids_string (), this.Sid);
         }
     
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]