simplify definition and usage of mgKeyTypes

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/branches/0.1.7-wr@736 e10066b5-e1e2-0310-b819-94efdf66514b

3 files changed, 7 insertions, 10 deletions

diff --git a/mg_keytypes.h b/mg_keytypes.h
index 3f7bf64..3271f19 100644
--- a/mg_keytypes.h
+++ b/mg_keytypes.h
@@ -35,16 +35,12 @@ enum mgKeyTypes {
 	keyGdTitleABC,
 	keyGdCollection,
 	keyGdCollectionItem,
+	keyGdUnique,
 	// here come other backends: keyXXTitle = 50, (reserve)
 	keyTypesHigh
 };
 const mgKeyTypes mgGdKeyTypesLow = keyGdGenre1;
-const mgKeyTypes mgGdKeyTypesHigh = keyGdCollectionItem;
-const mgKeyTypes mgKeyTypesLow = keyGdGenre1;
-const mgKeyTypes mgKeyTypesHigh = keyGdCollectionItem;
-
-//! \brief at least the number of enum elements:
-const unsigned int mgKeyTypesNr = keyGdCollectionItem;
+const mgKeyTypes mgGdKeyTypesHigh = keyGdUnique;
 
 enum mgSortBy {
 	mgSortNone,
diff --git a/mg_selection.c b/mg_selection.c
index 912e943..9781d32 100644
--- a/mg_selection.c
+++ b/mg_selection.c
@@ -1078,12 +1078,12 @@ mgSelection::keycount(mgKeyTypes kt) const
 {
 	if (keycounts.size()==0)
 	{
-		for (unsigned int ki=int(mgKeyTypesLow);ki<=int(mgKeyTypesHigh);ki++)
+		for (unsigned int ki=(unsigned int)(ktLow());ki<=(unsigned int)(ktHigh());ki++)
 		{
 			keycounts.push_back(-1);
 		}
 	}
-	int& kcount = keycounts[int(kt-mgKeyTypesLow)];
+	int& kcount = keycounts[int(kt-ktLow())];
 	if (kcount==-1)
 	{
 		mgKey* k = ktGenerate(kt);
diff --git a/vdr_menu.c b/vdr_menu.c
index f814cbb..d85b208 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -1065,15 +1065,16 @@ mgMenuOrder::BuildOsd ()
 	    m_selection->InitDefaultOrder(1);
     InitOsd ();
     m_keytypes.clear();
-    m_keytypes.reserve(mgKeyTypesNr+1);
     m_keynames.clear();
-    m_keynames.reserve(50);
     m_orderbycount = m_selection->getOrderByCount();
     for (unsigned int i=0;i<m_selection->ordersize();i++)
     {
 	unsigned int kt;
 	m_keynames.push_back(m_selection->Choices(i,&kt));
 	m_keytypes.push_back(kt);
+    }
+    for (unsigned int i=0;i<m_selection->ordersize();i++)
+    {
 	char buf[20];
 	sprintf(buf,tr("Key %d"),i+1);
 	mgAction *a = actGenerateKeyItem(buf,(int*)&m_keytypes[i],m_keynames[i].size(),&m_keynames[i][0]);