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

1 files changed, 4 insertions, 43 deletions

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 <huels@iname.com>
  */
 
-#ifndef ___SETUP_MG_H
-#define ___SETUP_MG_H
+#ifndef ___VDR_SETUP_MG_H
+#define ___VDR_SETUP_MG_H
 
 // #include <osd.h>
 #include <menuitems.h>
 #include <string>
 
-#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