Permalink
Browse files

v1.6RC1. fixed issue with playlist management. updated db to match v1.6.

  • Loading branch information...
1 parent bcac172 commit 1ce0a24899dcf310f8f9c9569bcb5f6c47418c91 @yoyofr committed Feb 15, 2012
@@ -2929,6 +2929,23 @@ -(void) updateAllSettingsAfterChange {
oglViewFullscreen=0;
[self oglViewSwitchFS];
}
+
+
+ if (infoIsFullscreen) {
+ infoZoom.hidden=YES;
+ infoUnzoom.hidden=NO;
+ } else {
+ infoZoom.hidden=NO;
+ infoUnzoom.hidden=YES;
+ }
+ if (plIsFullscreen) {
+ plZoom.hidden=YES;
+ plUnzoom.hidden=NO;
+ } else {
+ plZoom.hidden=NO;
+ plUnzoom.hidden=YES;
+ }
+
mLoopMode--;
[self changeLoopMode];
[mplayer setLoopInf:mplayer.mLoopMode^1];
@@ -5726,15 +5743,15 @@ -(void) openPopup:(NSString *)msg secmsg:(NSString*)secmsg{
[UIView setAnimationDelay:0];
[UIView setAnimationDuration:0.5];
frame=infoMsgView.frame;
- frame.origin.y=self.view.frame.size.height-124;
+ frame.origin.y=self.view.frame.size.height-144;
infoMsgView.frame=frame;
[UIView commitAnimations];
}
-(void) closePopup {
CGRect frame;
[UIView beginAnimations:@"hidePopup" context:nil];
[UIView setAnimationDelegate:self];
- [UIView setAnimationDelay:1.5];
+ [UIView setAnimationDelay:2.5];
[UIView setAnimationDuration:1.0];
frame=infoMsgView.frame;
frame.origin.y=self.view.frame.size.height;
@@ -1457,7 +1457,7 @@ -(void) uadeThread {
char *argv[5];
char *argv_buffer;
- if ([[NSThread currentThread] respondsToSelector:@selector(setThreadPriority)]) [[NSThread currentThread] setThreadPriority:0.9f];
+ if ([[NSThread currentThread] respondsToSelector:@selector(setThreadPriority)]) [[NSThread currentThread] setThreadPriority:SND_THREAD_PRIO];
argc=5;
argv_buffer=(char*)malloc(argc*32);
@@ -1917,7 +1917,7 @@ -(int) uade_playloop {
}
-(void) generateSoundThread {
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- if ([[NSThread currentThread] respondsToSelector:@selector(setThreadPriority)]) [[NSThread currentThread] setThreadPriority:0.9f];
+ if ([[NSThread currentThread] respondsToSelector:@selector(setThreadPriority)]) [[NSThread currentThread] setThreadPriority:SND_THREAD_PRIO];
while (1) {
@@ -3415,7 +3415,7 @@ -(int) LoadModule:(NSString*)_filePath defaultMODPLAYER:(int)defaultMODPLAYER sl
if (found==1) { //FEX
- if (singleArcMode&&(archiveIndex>=0)&&(archiveIndex<mdz_ArchiveFilesCnt)) {
+ if (mSingleFileType&&singleArcMode&&(archiveIndex>=0)&&(archiveIndex<mdz_ArchiveFilesCnt)) {
mdz_ArchiveFilesCnt=1;
[self fex_extractSingleFileToPath :[filePath UTF8String] path:[tmpArchivePath UTF8String] file_index:archiveIndex];
} else {
@@ -11,11 +11,11 @@
#define MODIZER_COMPIL 1
-#define DEFAULT_WAIT_TIME_MS 0.0001 //in s
+#define DEFAULT_WAIT_TIME_MS 0.001 //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"
@@ -32,14 +32,16 @@
#define PLAYBACK_FREQ 44100
#define SOUND_BUFFER_SIZE_SAMPLE PLAYBACK_FREQ/30
-#define SOUND_BUFFER_NB 30 //1second
+#define SOUND_BUFFER_NB 60 //1second
#define SPECTRUM_BANDS 64
#define LOG2_SPECTRUM_BANDS 6
#define BEAT_THRESHOLD_MIN 256
#define BEAT_THRESHOLD_FACTOR 2.0f
+#define SND_THREAD_PRIO 1.00f
+
#define SND_BUFFER_CURRENTTIME_FIX 1000
#define SEEK_START_MARGIN_FROM_END 2000
@@ -59,8 +61,8 @@
#define VERSION_MAJOR 1
#define VERSION_MAJOR_STR "1"
-#define VERSION_MINOR 5
-#define VERSION_MINOR_STR "5"
+#define VERSION_MINOR 6
+#define VERSION_MINOR_STR "6"
#define MAX_PL_ENTRIES 4096
@@ -106,21 +108,7 @@
#define SUPPORTED_FILETYPE_LHA_ARCHIVE @"LZH,LHA"
-#define SUPPORTED_FILETYPE_UADE_WITHEXTFILE @"AST,AHX,THX,ADPCM,AMC,ABK,AAM,ALP,AON,AON4,AON8,ADSC,MOD_ADSC4,BSS,BD,BDS,UDS,KRIS,CIN,CORE,CUS,CUST,CUSTOM,\
-CM,RK,RKB,DZ,MKIIO,DL,DL_DELI,DLN,DH,DW,DWOLD,DLM2,DM2,DLM1,DM1,DSR,DB,DIGI,DSC,DSS,DNS,EMS,EMSV6,EX,\
-FC13,FC3,FC,FC14,FC4,FRED,GRAY,BFC,BSI,FC-BSI,FP,FW,GLUE,GM,EA,MG,HD,HIPC,SOC,EMOD,QC,IMS,DUM,IS,IS20,\
-JAM,JC,JMF,JCB,JCBO,JPN,JPND,JP,JT,MON_OLD,JO,HIP,MCMD,SOG,HIP7,S7G,HST,KH,POWT,PT,LME,MON,MFP,HN,MTP2,\
-THN,MC,MCR,MCO,MK2,MKII,AVP,MW,MAX,MCMD_ORG,MED,MMD0,MMD1,MMD2,MSO,MD,MMDC,DMU,MUG,DMU2,MUG2,MA,MM4,\
-MM8,MMS,NTP,TWO,OCTAMED,OKT,ONE,DAT,PS,SNK,PVP,PAP,PSA,MOD_DOC,MOD15,MOD15_MST,NTK,MOD_NTK1,MOD_NTK2,\
-MOD_NTKAMP,MOD_FLT4,MOD,MOD_COMP,!PM!,40A,40B,41A,50A,60A,61A,AC1,AC1D,AVAL,CHAN,CP,CPLX,CRB,DI,EU,FC-M,FCM,\
-FT,FUZ,FUZZ,GMC,GV,HMC,HRT,HRT!,ICE,IT1,KEF,KEF7,KRS,KSM,LAX,MEXXMP,MPRO,NP,NP1,NP2,NOISEPACKER2,NP3,NOISEPACKER3,\
-NR,NRU,NTPK,P10,P21,P30,P40A,P40B,P41A,P4X,P50A,P5A,P5X,P60,P60A,P61,P61A,P6X,PHA,PIN,PM,PM0,PM01,PM1,PM10C,PM18A,\
-PM2,PM20,PM4,PM40,PMZ,POLK,PP10,PP20,PP21,PP30,PPK,PR1,PR2,PROM,PRU,PRU1,PRU2,PRUN,PRUN1,PRUN2,PWR,PYG,PYGM,PYGMY,\
-SKT,SKYT,SNT,SNT!,ST2,ST26,ST30,STAR,STPK,TP,TP1,TP2,TP3,UN2,UNIC,UNIC2,WN,XAN,XANN,ZEN,PUMA,RJP,SNG,RIFF,\
-RH,RHO,SA-P,SCUMM,S-C,SCN,SCR,SID1,SMN,SID2,MOK,SA,SONIC,SA_OLD,SMUS,SNX,TINY,SPL,SC,SCT,PSF,\
-SFX,SFX13,TW,SM,SM1,SM2,SM3,SMPRO,BP,SNDMON,BP3,SJS,JD,DODA,SAS,SS,SB,JPO,JPOLD,SUN,SYN,SDR,OSP,\
-ST,SYNMOD,TFMX1.5,TFHD1.5,TFMX7V,TFHD7V,MDAT,TFMXPRO,TFHDPRO,TFMX,MDST,THM,TF,TME,SG,DP,TRC,TRO,TRONIC,MOD15_UST,\
-VSS,WB,ML,MOD15_ST-IV,AGI,TPU,QPA,SQT,QTS"
+#define SUPPORTED_FILETYPE_UADE_WITHEXTFILE @"MDAT,SNG,DUM"
#define SUPPORTED_FILETYPE_UADE @"AST,AHX,THX,ADPCM,AMC,ABK,AAM,ALP,AON,AON4,AON8,ADSC,MOD_ADSC4,BSS,BD,BDS,UDS,KRIS,CIN,CORE,CUS,CUST,CUSTOM,\
CM,RK,RKB,DZ,MKIIO,DL,DL_DELI,DLN,DH,DW,DWOLD,DLM2,DM2,DLM1,DM1,DSR,DB,DIGI,DSC,DSS,DNS,EMS,EMSV6,EX,\
@@ -163,3 +151,26 @@ VSS,WB,ML,MOD15_ST-IV,AGI,TPU,QPA,SQT,QTS"
#define SUPPORTED_FILETYPE_GSF_EXT @"GSF,MINIGSF,GSFLIB"
#define SUPPORTED_FILETYPE_WMIDI @"MID,MIDI"
+
+
+#define extAMIGAList @"AST,AHX,THX,ADPCM,AMC,ABK,AAM,ALP,AON,AON4,AON8,ADSC,MOD_ADSC4,BSS,BD,BDS,UDS,KRIS,CIN,CORE,CUS,CUST,CUSTOM,CM,RK,RKB,DZ,MKIIO,DL,DL_DELI,DLN,DH,DW,DWOLD,DLM2,DM2,DLM1,DM1,DSR,DB,DIGI,DSC,DSS,DNS,EMS,EMSV6,EX,FC13,FC3,FC,FC14,FC4,FRED,GRAY,BFC,BSI,FC-BSI,FP,FW,GLUE,GM,EA,MG,HD,HIPC,SOC,EMOD,QC,IMS,DUM,IS,IS20,JAM,JC,JMF,JCB,JCBO,JPN,JPND,JP,JT,MON_OLD,JO,HIP,MCMD,SOG,HIP7,S7G,HST,KH,POWT,PT,LME,MON,MFP,HN,MTP2,THN,MC,MCR,MCO,MK2,MKII,AVP,MW,MAX,MCMD_ORG,MED,MMD0,MMD1,MMD2,MSO,MD,MMDC,DMU,MUG,DMU2,MUG2,MA,MM4,MM8,MMS,NTP,TWO,OCTAMED,OKT,ONE,DAT,PS,SNK,PVP,PAP,PSA,MOD_DOC,MOD15,MOD15_MST,MOD_NTK,MOD_NTK1,MOD_NTK2,MOD_NTKAMP,MOD_FLT4,MOD,MOD_COMP,!PM!,40A,40B,41A,50A,60A,61A,AC1,AC1D,AVAL,CHAN,CP,CPLX,CRB,DI,EU,FC-M,FCM,FT,FUZ,FUZZ,GMC,GV,HMC,HRT,HRT!,ICE,IT1,KEF,KEF7,KRS,KSM,LAX,MEXXMP,MPRO,NP,NP1,NP2,NOISEPACKER2,NP3,NOISEPACKER3,NR,NRU,NTPK,P10,P21,P30,P40A,P40B,P41A,P4X,P50A,P5A,P5X,P60,P60A,P61,P61A,P6X,PHA,PIN,PM,PM0,PM01,PM1,PM10C,PM18A,PM2,PM20,PM4,PM40,PMZ,POLK,PP10,PP20,PP21,PP30,PPK,PR1,PR2,PROM,PRU,PRU1,PRU2,PRUN,PRUN1,PRUN2,PWR,PYG,PYGM,PYGMY,SKT,SKYT,SNT,SNT!,ST2,ST26,ST30,STAR,STPK,TP,TP1,TP2,TP3,UN2,UNIC,UNIC2,WN,XAN,XANN,ZEN,PUMA,RJP,SNG,RIFF,RH,RHO,SA-P,SCUMM,S-C,SCN,SCR,SID1,SMN,SID2,MOK,SA,SONIC,SA_OLD,SMUS,SNX,TINY,SPL,SC,SCT,SFX,SFX13,TW,SM,SM1,SM2,SM3,SMPRO,BP,SNDMON,BP3,SJS,JD,DODA,SAS,SS,SB,JPO,JPOLD,SUN,SYN,SDR,OSP,ST,SYNMOD,TFMX1.5,TFHD1.5,TFMX7V,TFHD7V,MDAT,TFMXPRO,TFHDPRO,TFMX,MDST,THM,TF,TME,SG,DP,TRC,TRO,TRONIC,MOD15_UST,VSS,WB,ML,MOD15_ST-IV,AGI,TPU,QPA,SQT,QTS"
+#define extPCList @"FT,MOD,S3M,XM,MED,MMD0,MMD1,MMD2,MMD3,MMD4,MMDC,MTM,IT,669,ULT,STM,FAR,WAV,AMF,AMS,DSM,MDL,OKT,DMF,PTM,DBM,MT2,AMF0,PSM,J2B,ABC,PAT,UMX,A2M,ADL,AMD,AS3M,BAM,BMF,CFF,CMF,D00,DFM,DM0,DMO,DR0,DRO,DTM,HSC,HSP,IMF,KSM,LAA,LDS,M,MAD,MKJ,MSC,MTK,RAD,RAW,RIX,ROL,SA2,SAT,SCI,SNG,XAD,XMS,XSM"
+#define extC64ChipList @"SID,AHX,HVL"
+#define extSNESList @"SPC,RSN"
+#define extNESList @"NSF,NSFE"
+#define extGBList @"GBS"
+#define extSEGAMDList @"GYM,VGM,VGZ"
+#define extNECList @"HES"
+#define extMSXList @"KSS"
+#define extPOKEYList @"SAP,CMC,CM3,CMR,CMS,DMC,DLT,MPT,MPD,RMT,TMC,TM8,TM2"
+#define extYMAYList @"YM,AY"
+#define extATARISTList @"SC68,SNDH"
+#define extPS1List @"PSF,MINIPSF,SPU,MINISPU"
+#define extPS2List @"PSF2,MINIPSF2"
+#define extX68List @"MDX,PDX"
+#define extGBAList @"GSF,MINIGSF"
+#define extDCList @"DSF,MINIDSF"
+#define extCAPCOMList @"QSF,MINIQSF"
+#define extSATList @"SSF,MINISSF"
+#define extMIDIList @"MID,MIDI"
+#define extPC98List @"M,M2,MZ"
@@ -31,7 +31,7 @@
@class WebBrowser;
-@interface RootViewControllerIphone : UITableViewController <UISearchBarDelegate> {
+@interface RootViewControllerIphone : UITableViewController <UISearchBarDelegate,UITextInputDelegate> {
NSString *ratingImg[6];
UIView *infoMsgView;
UILabel *infoMsgLbl;
@@ -5572,16 +5572,17 @@ - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
}
-(IBAction)cancelPlaylistName{
- mValidatePlName=0;
+ if (childController) [childController cancelPlaylistName];
[self dismissModalViewControllerAnimated:YES];
}
-(IBAction)validatePlaylistName{
- mValidatePlName=1;
+ if (childController) [childController validatePlaylistName];
[self dismissModalViewControllerAnimated:YES];
}
+
- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
[theTextField resignFirstResponder];
- [self validatePlaylistName];
+ if (childController) [childController validatePlaylistName];
return YES;
}
@@ -6102,6 +6103,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
((RootViewControllerPlaylist*)childController)->browse_depth = browse_depth+1;
((RootViewControllerPlaylist*)childController)->detailViewController=detailViewController;
((RootViewControllerPlaylist*)childController)->playerButton=playerButton;
+ ((RootViewControllerPlaylist*)childController)->textInputView=textInputView;
+ ((RootViewControllerPlaylist*)childController)->inputText=inputText;
// And push the window
[self.navigationController pushViewController:childController animated:YES];
[keys release];keys=nil;
@@ -14,7 +14,7 @@
@class DetailViewControllerIphone;
-@interface RootViewControllerPlaylist : UITableViewController <UISearchBarDelegate> {
+@interface RootViewControllerPlaylist : UITableViewController <UISearchBarDelegate,UITextFieldDelegate> {
NSString *ratingImg[6];
UIView *infoMsgView;
UILabel *infoMsgLbl;
@@ -26,9 +26,7 @@
IBOutlet UITableView *tabView;
- IBOutlet UISearchBar *sBar;
- IBOutlet UIViewController *textInputView;
- IBOutlet UITextField *inputText;
+ IBOutlet UISearchBar *sBar;
NSMutableArray *list;
NSMutableArray *keys;
@@ -70,8 +68,9 @@
@public
int browse_depth;
IBOutlet DetailViewControllerIphone *detailViewController;
- IBOutlet UIBarButtonItem *playerButton;
-
+ IBOutlet UIBarButtonItem *playerButton;
+ IBOutlet UIViewController *textInputView;
+ IBOutlet UITextField *inputText;
}
@property (nonatomic, retain) NSFileManager *mFileMngr;
@@ -2032,11 +2032,11 @@ - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
-(IBAction)cancelPlaylistName{
mValidatePlName=0;
- [self dismissModalViewControllerAnimated:YES];
+ //[self dismissModalViewControllerAnimated:YES];
}
-(IBAction)validatePlaylistName{
mValidatePlName=1;
- [self dismissModalViewControllerAnimated:YES];
+ //[self dismissModalViewControllerAnimated:YES];
}
- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
[theTextField resignFirstResponder];
@@ -2253,6 +2253,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
if ((indexPath.row==1)&&(detailViewController.mPlaylist_size)) { //save current list
newPlaylist=2;
mValidatePlName=0;
+
[self presentModalViewController:textInputView animated:YES];
}
if (indexPath.row>=2) { //show a playlist
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 1ce0a24

Please sign in to comment.