[rygel] core: AudioItem.n_audio_channels -> channels

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 1e6ba7def8b397f87d63c1ede4c59027ddaca0e1
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Sep 24 20:45:09 2010 +0300

    core: AudioItem.n_audio_channels -> channels
    
    Rename 'n_audio_channels' field of AudioItem to 'channels'.

 .../media-export/rygel-media-export-item.vala      |    4 ++--
 .../rygel-media-export-media-cache.vala            |    5 ++---
 src/rygel/rygel-audio-item.vala                    |    4 ++--
 src/rygel/rygel-l16-transcoder.vala                |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-item.vala b/src/plugins/media-export/rygel-media-export-item.vala
index 63d1992..77cf642 100644
--- a/src/plugins/media-export/rygel-media-export-item.vala
+++ b/src/plugins/media-export/rygel-media-export-item.vala
@@ -127,7 +127,7 @@ namespace Rygel.MediaExport.ItemFactory {
                 audio_info.tags.get_uint (TAG_BITRATE, out tmp);
                 item.bitrate = (int) tmp / 8;
             }
-            item.n_audio_channels = (int) audio_info.channels;
+            item.channels = (int) audio_info.channels;
             item.sample_freq = (int) audio_info.sample_rate;
         }
     }
@@ -149,7 +149,7 @@ namespace Rygel.MediaExport.ItemFactory {
         item.color_depth = (int) video_info.depth;
 
         if (audio_info != null) {
-            item.n_audio_channels = (int) audio_info.channels;
+            item.channels = (int) audio_info.channels;
             item.sample_freq = (int) audio_info.sample_rate;
             if (audio_info.tags != null) {
                 uint tmp;
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index d8e9dbf..1093bca 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -444,7 +444,7 @@ public class Rygel.MediaExport.MediaCache : Object {
             values[8] = audio_item.bitrate;
             values[9] = audio_item.sample_freq;
             values[10] = audio_item.bits_per_sample;
-            values[11] = audio_item.n_audio_channels;
+            values[11] = audio_item.channels;
             if (item is MusicItem) {
                 var music_item = item as MusicItem;
                 values[5] = music_item.artist;
@@ -581,8 +581,7 @@ public class Rygel.MediaExport.MediaCache : Object {
             audio_item.sample_freq = statement.column_int (DetailColumn.SAMPLE_FREQ);
             audio_item.bits_per_sample = statement.column_int (
                                         DetailColumn.BITS_PER_SAMPLE);
-            audio_item.n_audio_channels = statement.column_int (
-                                        DetailColumn.CHANNELS);
+            audio_item.channels = statement.column_int (DetailColumn.CHANNELS);
             if (item is MusicItem) {
                 var music_item = item as MusicItem;
                 music_item.artist = statement.column_text (DetailColumn.AUTHOR);
diff --git a/src/rygel/rygel-audio-item.vala b/src/rygel/rygel-audio-item.vala
index eb58f26..6b6f5b5 100644
--- a/src/rygel/rygel-audio-item.vala
+++ b/src/rygel/rygel-audio-item.vala
@@ -35,7 +35,7 @@ public class Rygel.AudioItem : MediaItem {
 
     public int sample_freq = -1;
     public int bits_per_sample = -1;
-    public int n_audio_channels = -1;
+    public int channels = -1;
 
     public AudioItem (string         id,
                       MediaContainer parent,
@@ -60,7 +60,7 @@ public class Rygel.AudioItem : MediaItem {
         res.bitrate = this.bitrate;
         res.sample_freq = this.sample_freq;
         res.bits_per_sample = this.bits_per_sample;
-        res.audio_channels = this.n_audio_channels;
+        res.audio_channels = this.channels;
 
         return res;
     }
diff --git a/src/rygel/rygel-l16-transcoder.vala b/src/rygel/rygel-l16-transcoder.vala
index f2d7c31..ac9bbff 100644
--- a/src/rygel/rygel-l16-transcoder.vala
+++ b/src/rygel/rygel-l16-transcoder.vala
@@ -94,8 +94,8 @@ internal class Rygel.L16Transcoder : Rygel.Transcoder {
             distance += (audio_item.sample_freq - FREQUENCY).abs ();
         }
 
-        if (audio_item.n_audio_channels > 0) {
-            distance += (audio_item.n_audio_channels - CHANNELS).abs ();
+        if (audio_item.channels > 0) {
+            distance += (audio_item.channels - CHANNELS).abs ();
         }
 
         if (audio_item.bits_per_sample > 0) {