diff options
| author | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-02-20 12:15:09 +0000 |
|---|---|---|
| committer | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-02-20 12:15:09 +0000 |
| commit | aa015d3fb203161f0a37d0e5e7e8b07ae788e7e1 (patch) | |
| tree | 398acd86fc81a700451d857afa04d7746e88027f /muggle-plugin/vdr_menu.c | |
| parent | 52561b4e1c80f296bd337135ab8fe51716fc6974 (diff) | |
| download | vdr-plugin-muggle-aa015d3fb203161f0a37d0e5e7e8b07ae788e7e1.tar.gz vdr-plugin-muggle-aa015d3fb203161f0a37d0e5e7e8b07ae788e7e1.tar.bz2 | |
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@494 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/vdr_menu.c')
| -rw-r--r-- | muggle-plugin/vdr_menu.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c index 605b675..d2bb163 100644 --- a/muggle-plugin/vdr_menu.c +++ b/muggle-plugin/vdr_menu.c @@ -363,13 +363,15 @@ mgMainMenu::AddOrder() void mgMainMenu::DeleteOrder() { + mgOrder *o = orders[Current()]; + delete o; orders.erase(orders.begin()+Current()); } void mgMainMenu::LoadOrders(mgValmap& nv) { - for (unsigned int idx=0;idx<10;idx++) + for (unsigned int idx=0;idx<1000;idx++) { char b[10]; sprintf(b,"order%u",idx); @@ -377,7 +379,7 @@ mgMainMenu::LoadOrders(mgValmap& nv) if (o->size()==0) { delete o; - continue; + break; } orders.push_back(o); } @@ -386,20 +388,20 @@ mgMainMenu::LoadOrders(mgValmap& nv) m_current_order=0; if (orders.size()>0) return; - nv.put("order1.Keys.0.Type",keyArtist); - nv.put("order1.Keys.1.Type",keyAlbum); - nv.put("order1.Keys.2.Type",keyTrack); + nv.put("order0.Keys.0.Type",keyArtist); + nv.put("order0.Keys.1.Type",keyAlbum); + nv.put("order0.Keys.2.Type",keyTrack); - nv.put("order2.Keys.0.Type",keyAlbum); - nv.put("order2.Keys.1.Type",keyTrack); + nv.put("order1.Keys.0.Type",keyAlbum); + nv.put("order1.Keys.1.Type",keyTrack); - nv.put("order3.Keys.0.Type",keyGenres); - nv.put("order3.Keys.1.Type",keyArtist); - nv.put("order3.Keys.2.Type",keyAlbum); - nv.put("order3.Keys.3.Type",keyTrack); + nv.put("order2.Keys.0.Type",keyGenres); + nv.put("order2.Keys.1.Type",keyArtist); + nv.put("order2.Keys.2.Type",keyAlbum); + nv.put("order2.Keys.3.Type",keyTrack); - nv.put("order4.Keys.0.Type",keyArtist); - nv.put("order4.Keys.1.Type",keyTrack); + nv.put("order3.Keys.0.Type",keyArtist); + nv.put("order3.Keys.1.Type",keyTrack); nv.put("CurrentOrder",0); LoadOrders(nv); |