From 299c2e024269d0d1b71d73e960f9758a0d28656b Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sat, 18 Feb 2012 15:46:28 +0400 Subject: [PATCH] eitd/dmx.h: move get_eit_version, get_current_service to header; change current_service type to t_channel_id Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/4925620eece71ed1a2e1e494b95630790a830726 Author: [CST] Focus Date: 2012-02-18 (Sat, 18 Feb 2012) --- src/eitd/dmx.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/eitd/dmx.h b/src/eitd/dmx.h index c022b6335..f1716459d 100644 --- a/src/eitd/dmx.h +++ b/src/eitd/dmx.h @@ -36,6 +36,7 @@ #include #endif +#include #include #include @@ -55,7 +56,7 @@ protected: unsigned short pID; unsigned short dmxBufferSizeInKB; sections_id_t first_skipped; - int current_service; + t_channel_id current_service; unsigned char eit_version; bool cache; /* should read sections be cached? true for all but dmxCN */ int real_pauseCounter; @@ -104,7 +105,7 @@ public: int request_pause(void); int request_unpause(void); - int change(const int new_filter_index, const int new_current_service = -1); // locks while changing + int change(const int new_filter_index, const t_channel_id new_current_service = 0); // locks while changing void lock(void); void unlock(void); @@ -112,12 +113,12 @@ public: // section with size < 3 + 5 are skipped ! int getSection(uint8_t *buf, const unsigned timeoutInMSeconds, int &timeouts); int setPid(const unsigned short new_pid); - int setCurrentService(int new_current_service); + int setCurrentService(t_channel_id new_current_service); int dropCachedSectionIDs(); - unsigned char get_eit_version(void); + unsigned char get_eit_version(void) { return eit_version; } // was useful for debugging... - unsigned int get_current_service(void); + t_channel_id get_current_service(void) { return current_service; } }; #endif /* __sectionsd__dmx_h__ */