From 616adfc77dc1d08f3bfcd79991a78c6350e4e2f6 Mon Sep 17 00:00:00 2001 From: lvw Date: Fri, 28 May 2004 15:29:19 +0000 Subject: Merged player branch back on HEAD branch. git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@98 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 vdr_setup.h (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h new file mode 100644 index 0000000..a77cf75 --- /dev/null +++ b/vdr_setup.h @@ -0,0 +1,76 @@ +/*! + * \file vdr_setup.h + * \brief A setup class for a VDR media plugin (muggle) + * + * \version $Revision: 1.2 $ + * \date $Date: 2004/05/28 15:29:19 $ + * \author Ralf Klueber, Lars von Wedel, Andreas Kellner + * \author Responsible author: $Author: lvw $ + * + * $Id: vdr_setup.h,v 1.2 2004/05/28 15:29:19 lvw Exp $ + * + * Adapted from + * MP3/MPlayer plugin to VDR (C++) + * (C) 2001,2002 Stefan Huelswitt + */ + +#ifndef ___SETUP_MG_H +#define ___SETUP_MG_H + +// #include +#include + +#define MAX_STRING_LEN 128 + +#define DEFAULT_TARGET_LEVEL 25 +#define MAX_TARGET_LEVEL 50 +#define DEFAULT_LIMITER_LEVEL 70 +#define MIN_LIMITER_LEVEL 25 + +/*! + * \brief storage for setup data + */ +class mgSetup +{ +public: + int InitLoopMode; + int InitShuffleMode; + int AudioMode; + int DisplayMode; + int BackgrMode; + int MenuMode; + int TargetLevel; + int LimiterLevel; + int Only48kHz; + + char *DbHost; + char *DbName; + char *DbUser; + char *DbPass; + int DbPort; + bool GdCompatibility; + char *ToplevelDir; + + char PathPrefix[MAX_STRING_LEN]; + + public: + mgSetup(void); +}; + +extern mgSetup the_setup; + +/*! + * \brief allow user to modify setup on OSD + */ +class mgMenuSetup : public cMenuSetupPage +{ +private: + mgSetup m_data; +protected: + virtual void Store(); +public: + mgMenuSetup(); +}; + + +#endif //___SETUP_MP3_H -- cgit v1.2.3 From 50075887187e1801f3d3425f20a6b6127ffd7ff8 Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 4 Oct 2004 07:30:45 +0000 Subject: Added patch for using sockets and improved menu translations git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@199 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index a77cf75..5750146 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -3,11 +3,11 @@ * \brief A setup class for a VDR media plugin (muggle) * * \version $Revision: 1.2 $ - * \date $Date: 2004/05/28 15:29:19 $ + * \date $Date$ * \author Ralf Klueber, Lars von Wedel, Andreas Kellner - * \author Responsible author: $Author: lvw $ + * \author Responsible author: $Author$ * - * $Id: vdr_setup.h,v 1.2 2004/05/28 15:29:19 lvw Exp $ + * $Id$ * * Adapted from * MP3/MPlayer plugin to VDR (C++) @@ -44,6 +44,7 @@ public: int Only48kHz; char *DbHost; + char *DbSocket; char *DbName; char *DbUser; char *DbPass; -- cgit v1.2.3 From 5cbca2e0dcfb32cd6a326205f93d66c8716dbdda Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 25 Oct 2004 15:34:17 +0000 Subject: Track and progress view now persistent across VDR sessions git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@245 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index 5750146..b88a3ac 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -52,6 +52,9 @@ public: bool GdCompatibility; char *ToplevelDir; + bool trackview; + bool progressview; + char PathPrefix[MAX_STRING_LEN]; public: -- cgit v1.2.3 From c0be06a6d528738699a41bcf5fd7ee9fb68a78fd Mon Sep 17 00:00:00 2001 From: lvw Date: Tue, 26 Oct 2004 00:56:50 +0000 Subject: Tested resume feature git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@246 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index b88a3ac..1c59235 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -52,8 +52,8 @@ public: bool GdCompatibility; char *ToplevelDir; - bool trackview; - bool progressview; + int trackview; + int progressview; char PathPrefix[MAX_STRING_LEN]; -- cgit v1.2.3 From 4665fa3dac377fc251c4201aff3d9b15ee64474e Mon Sep 17 00:00:00 2001 From: lvw Date: Wed, 27 Oct 2004 15:01:02 +0000 Subject: Save visibility status git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@256 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 1 + 1 file changed, 1 insertion(+) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index 1c59235..e96df84 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -52,6 +52,7 @@ public: bool GdCompatibility; char *ToplevelDir; + int visible; int trackview; int progressview; -- cgit v1.2.3 From 0756ae40d68d403082c86adef042a4c0daba219f Mon Sep 17 00:00:00 2001 From: LarsAC Date: Fri, 7 Jan 2005 18:43:03 +0000 Subject: Merged branch osd_extensions back to main trunk git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@324 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 66 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index e96df84..c21adb1 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -9,7 +9,7 @@ * * $Id$ * - * Adapted from + * Adapted from * MP3/MPlayer plugin to VDR (C++) * (C) 2001,2002 Stefan Huelswitt */ @@ -32,34 +32,30 @@ */ class mgSetup { -public: - int InitLoopMode; - int InitShuffleMode; - int AudioMode; - int DisplayMode; - int BackgrMode; - int MenuMode; - int TargetLevel; - int LimiterLevel; - int Only48kHz; + public: + int InitLoopMode; + int InitShuffleMode; + int AudioMode; + int DisplayMode; + int BackgrMode; + int MenuMode; + int TargetLevel; + int LimiterLevel; + int Only48kHz; - char *DbHost; - char *DbSocket; - char *DbName; - char *DbUser; - char *DbPass; - int DbPort; - bool GdCompatibility; - char *ToplevelDir; + char *DbHost; + char *DbSocket; + char *DbName; + char *DbUser; + char *DbPass; + int DbPort; + bool GdCompatibility; + char *ToplevelDir; - int visible; - int trackview; - int progressview; + char PathPrefix[MAX_STRING_LEN]; - char PathPrefix[MAX_STRING_LEN]; - - public: - mgSetup(void); + public: + mgSetup (void); }; extern mgSetup the_setup; @@ -67,15 +63,13 @@ extern mgSetup the_setup; /*! * \brief allow user to modify setup on OSD */ -class mgMenuSetup : public cMenuSetupPage +class mgMenuSetup:public cMenuSetupPage { -private: - mgSetup m_data; -protected: - virtual void Store(); -public: - mgMenuSetup(); + private: + mgSetup m_data; + protected: + virtual void Store (); + public: + mgMenuSetup (); }; - - -#endif //___SETUP_MP3_H +#endif //___SETUP_MP3_H -- cgit v1.2.3 From f3d430aa36ace2edfa471e8eeb541a46f9e9e2ea Mon Sep 17 00:00:00 2001 From: LarsAC Date: Sun, 16 Jan 2005 21:41:00 +0000 Subject: Add GD compatibility for unique filenames git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@362 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index c21adb1..b820857 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -19,6 +19,7 @@ // #include #include +#include #define MAX_STRING_LEN 128 @@ -56,6 +57,8 @@ class mgSetup public: mgSetup (void); + + std::string getFilename( std::string basename ); }; extern mgSetup the_setup; -- cgit v1.2.3 From 14f5032e141da131f3d1f72979cf415d6105d819 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Mon, 7 Feb 2005 09:17:20 +0000 Subject: Merged most recent stuff from osd_extensions trunk for next release (0.1.2) git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@447 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 1 - 1 file changed, 1 deletion(-) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index b820857..f17aa2a 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -58,7 +58,6 @@ class mgSetup public: mgSetup (void); - std::string getFilename( std::string basename ); }; extern mgSetup the_setup; -- cgit v1.2.3 From 825586656f62847a44329e39d0ba2684f86bdbbe Mon Sep 17 00:00:00 2001 From: wr61 Date: Sun, 20 Feb 2005 12:15:09 +0000 Subject: sort by folder, show track counts, use shuttle/loop from setup, separate mg_setup from vdr_setup, better error reporting in mugglei, escape cddbid in mugglei git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@494 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_setup.h | 47 ++++------------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) (limited to 'vdr_setup.h') diff --git a/vdr_setup.h b/vdr_setup.h index f17aa2a..354534f 100644 --- a/vdr_setup.h +++ b/vdr_setup.h @@ -14,53 +14,14 @@ * (C) 2001,2002 Stefan Huelswitt */ -#ifndef ___SETUP_MG_H -#define ___SETUP_MG_H +#ifndef ___VDR_SETUP_MG_H +#define ___VDR_SETUP_MG_H // #include #include #include -#define MAX_STRING_LEN 128 - -#define DEFAULT_TARGET_LEVEL 25 -#define MAX_TARGET_LEVEL 50 -#define DEFAULT_LIMITER_LEVEL 70 -#define MIN_LIMITER_LEVEL 25 - -/*! - * \brief storage for setup data - */ -class mgSetup -{ - public: - int InitLoopMode; - int InitShuffleMode; - int AudioMode; - int DisplayMode; - int BackgrMode; - int MenuMode; - int TargetLevel; - int LimiterLevel; - int Only48kHz; - - char *DbHost; - char *DbSocket; - char *DbName; - char *DbUser; - char *DbPass; - int DbPort; - bool GdCompatibility; - char *ToplevelDir; - - char PathPrefix[MAX_STRING_LEN]; - - public: - mgSetup (void); - -}; - -extern mgSetup the_setup; +#include "mg_setup.h" /*! * \brief allow user to modify setup on OSD @@ -74,4 +35,4 @@ class mgMenuSetup:public cMenuSetupPage public: mgMenuSetup (); }; -#endif //___SETUP_MP3_H +#endif -- cgit v1.2.3