From c63dddcaf64a23d9ff376d14f49eafa42088a154 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 13 Apr 2012 17:22:02 +0400
Subject: [PATCH] src/zapit/include/zapit/zapit.h: fix merge problems

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/554ded6471584c10311aad77692cf433bea83796
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/zapit/include/zapit/zapit.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h
index 10054881c..dc2f87554 100644
--- a/src/zapit/include/zapit/zapit.h
+++ b/src/zapit/include/zapit/zapit.h
@@ -125,13 +125,14 @@ class CZapit : public OpenThreads::Thread
 		audio_map_t audio_map;
 		bool current_is_nvod;
 		//bool standby;
-		uint32_t  lastChannelRadio;
-		uint32_t  lastChannelTV;
+		t_channel_id  lastChannelRadio;
+		t_channel_id  lastChannelTV;
 		int abort_zapit;
 		int pmt_update_fd;
 
 		//void LoadAudioMap();
-		void SaveSettings(bool write_conf, bool write_audio);
+		void SaveAudioMap();
+		void SaveSettings(bool write_conf);
 		//void SaveChannelPids(CZapitChannel* channel);
 		void RestoreChannelPids(CZapitChannel* channel);
 		//void ConfigFrontend();