Permalink
Browse files

v1.6wip. multiple changes, check modizer_changes.txt

  • Loading branch information...
1 parent 61dfd91 commit 7b58e4339c5f1be0ae9a550f0c1699a89bae974a @yoyofr committed Feb 14, 2012
@@ -1410,17 +1410,17 @@ -(BOOL)play_curEntry {
-(void)play_prevEntry {
if (mShuffle) {
- int i;
+ /*int i;
int minval;
minval=mPlaylist[0].mPlaylistCount;
for (i=0;i<mPlaylist_size;i++) if (mPlaylist[i].mPlaylistCount<minval) minval=mPlaylist[i].mPlaylistCount;
-
+ */
mPlaylist_pos=arc4random()%(mPlaylist_size);
- i=0;
+ /*i=0;
while ((i<mPlaylist_size)&&(mPlaylist[mPlaylist_pos].mPlaylistCount>minval)) {
i++;
mPlaylist_pos++; if (mPlaylist_pos>=mPlaylist_size) mPlaylist_pos=0;
- }
+ }*/
[self play_curEntry];
} else {
if (mPlaylist_pos>0) mPlaylist_pos--;
@@ -1431,17 +1431,17 @@ -(void)play_prevEntry {
-(void)play_nextEntry {
if (mShuffle) {
- int i;
+ /*int i;
int minval;
minval=mPlaylist[0].mPlaylistCount;
- for (i=0;i<mPlaylist_size;i++) if (mPlaylist[i].mPlaylistCount<minval) minval=mPlaylist[i].mPlaylistCount;
+ for (i=0;i<mPlaylist_size;i++) if (mPlaylist[i].mPlaylistCount<minval) minval=mPlaylist[i].mPlaylistCount;*/
mPlaylist_pos=arc4random()%(mPlaylist_size);
- i=0;
+ /*i=0;
while ((i<mPlaylist_size)&&(mPlaylist[mPlaylist_pos].mPlaylistCount>minval)) {
i++;
mPlaylist_pos++; if (mPlaylist_pos>=mPlaylist_size) mPlaylist_pos=0;
- }
+ }*/
[self play_curEntry];
} else if (mPlaylist_pos<mPlaylist_size-1) {
mPlaylist_pos++;
@@ -5530,6 +5530,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
bottomLabel.text = [NSString stringWithFormat:@"%@",[filename_parts objectAtIndex:[filename_parts count]-2]];
} else bottomLabel.text = @"";
}
+
+
+ NSArray *filename_IsArc=[mPlaylist[indexPath.row].mPlaylistFilepath componentsSeparatedByString:@"@"];
+ NSArray *filename_IsSub=[mPlaylist[indexPath.row].mPlaylistFilepath componentsSeparatedByString:@"?"];
+ if ([filename_IsArc count]>1) {//this is an archive entry
+ bottomLabel.text=[bottomLabel.text stringByAppendingFormat:@"/%@",[filename_parts objectAtIndex:[filename_parts count]-1]];
+ } else if ([filename_IsSub count]>1) {//this is a subsong entry
+ bottomLabel.text=[bottomLabel.text stringByAppendingFormat:@"/%@",[filename_parts objectAtIndex:[filename_parts count]-1]];
+ }
+
cell.accessoryType = UITableViewCellAccessoryNone;
//TODO
@@ -3431,7 +3431,7 @@ -(int) LoadModule:(NSString*)_filePath defaultMODPLAYER:(int)defaultMODPLAYER sl
filePath=[NSHomeDirectory() stringByAppendingPathComponent:_filePath];
sprintf(mod_filename,"%s/%s",archive_filename,[[filePath lastPathComponent] UTF8String]);
- NSLog(@"%@",_filePath);
+ //NSLog(@"%@",_filePath);
} else return -1;
} else { //LHA
int argc;
@@ -14,8 +14,8 @@
#define DEFAULT_WAIT_TIME_MS 0.0001 //in s
#define DEFAULT_WAIT_TIME_UADE_MS 0.001 //in s
-//#define STATISTICS_URL @"http://localhost:8080"
-#define STATISTICS_URL @"https://modizerdb.appspot.com"
+#define STATISTICS_URL @"http://localhost:8080"
+//#define STATISTICS_URL @"https://modizerdb.appspot.com"
#define USERGUIDE_URL @"UserGuide"
#define WORLDCHARTS_DEFAULTLIST @"ListALL"
@@ -27,6 +27,8 @@
IBOutlet UISearchBar *sBar;
+ NSFileManager *mFileMngr;
+
NSMutableArray *list;
NSMutableArray *keys;
NSMutableArray *indexTitles,*indexTitlesDownload;
@@ -72,6 +74,8 @@
}
+@property (nonatomic, retain) NSFileManager *mFileMngr;
+
@property (nonatomic, retain) IBOutlet DetailViewControllerIphone *detailViewController;
@property (nonatomic, retain) IBOutlet DownloadViewController *downloadViewController;
@property (nonatomic, retain) IBOutlet UIViewController *childController;
@@ -27,8 +27,6 @@
static int local_flag;
static volatile int mPopupAnimation=0;
-static NSFileManager *mFileMngr;
-
#import "AppDelegate_Phone.h"
#import "RootViewControllerHVSC.h"
#import "DetailViewControllerIphone.h"
@@ -38,6 +36,7 @@
@implementation RootViewControllerHVSC
+@synthesize mFileMngr;
@synthesize detailViewController;
@synthesize downloadViewController;
@synthesize tabView,sBar;
@@ -50,6 +50,9 @@
IBOutlet UIBarButtonItem *playerButton;
+ NSFileManager *mFileMngr;
+
+
NSMutableArray *list;
NSMutableArray *keys;
NSMutableArray *indexTitles,*indexTitlesDownload;
@@ -123,6 +126,8 @@
int mCurrentWinAskedDownload;
}
+@property (nonatomic, retain) NSFileManager *mFileMngr;
+
@property (nonatomic, retain) IBOutlet DetailViewControllerIphone *detailViewController;
@property (nonatomic, retain) IBOutlet DownloadViewController *downloadViewController;
@property (nonatomic, retain) IBOutlet WebBrowser *webBrowser;
Oops, something went wrong.

0 comments on commit 7b58e43

Please sign in to comment.