author | zautrix <zautrix> | 2004-08-30 20:17:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-30 20:17:00 (UTC) |
commit | 5f4867356dc4b34da20b66e9ede71e22899e4a4b (patch) (side-by-side diff) | |
tree | 6d1f0b45349d36db9afbb83a4d590047a922a5fb /gammu/emb | |
parent | c015c3061d8d5b81316b862fd927340d9909aabc (diff) | |
download | kdepimpi-5f4867356dc4b34da20b66e9ede71e22899e4a4b.zip kdepimpi-5f4867356dc4b34da20b66e9ede71e22899e4a4b.tar.gz kdepimpi-5f4867356dc4b34da20b66e9ede71e22899e4a4b.tar.bz2 |
More pro file fixes
-rw-r--r-- | gammu/emb/common/common.pro | 2 | ||||
-rw-r--r-- | gammu/emb/common/commonE.pro | 1 | ||||
-rw-r--r-- | gammu/emb/common/service/gsmring.c | 3 | ||||
-rw-r--r-- | gammu/emb/gammu/gammu.pro | 3 | ||||
-rw-r--r-- | gammu/emb/gammu/gammuE.pro | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro index d27dbeb..9342cb7 100644 --- a/gammu/emb/common/common.pro +++ b/gammu/emb/common/common.pro @@ -152,35 +152,35 @@ protocol/nokia/mbus2.c \ protocol/nokia/fbus2.c \ protocol/nokia/phonet.c \ protocol/obex/obex.c \ protocol/symbian/mrouter.c \ phone/pfunc.c \ phone/at/atgen.c \ phone/at/siemens.c \ phone/at/sonyeric.c \ phone/alcatel/alcatel.c \ phone/nokia/dct3/n6110.c \ phone/nokia/dct3/n7110.c \ phone/nokia/dct3/n9210.c \ phone/nokia/dct3/dct3func.c \ phone/nokia/dct4/n3320.c \ phone/nokia/dct4/n3650.c \ phone/nokia/dct4/n6510.c \ phone/nokia/dct4/dct4func.c \ phone/nokia/nauto.c \ phone/nokia/nfunc.c \ phone/nokia/nfuncold.c \ phone/obex/obexgen.c \ phone/symbian/mroutgen.c TARGET = microgammu -CONFIG += console +CONFIG = warn_off release console DESTDIR = ../../../bin OBJECTS_DIR = obj/unix MOC_DIR = moc/unix unix: { SOURCES += device/serial/ser_unx.c } win32:{ SOURCES += device/serial/ser_w32.c } diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro index 49fecc6..33c0224 100644 --- a/gammu/emb/common/commonE.pro +++ b/gammu/emb/common/commonE.pro @@ -156,24 +156,25 @@ protocol/obex/obex.c \ protocol/symbian/mrouter.c \ phone/pfunc.c \ phone/at/atgen.c \ phone/at/siemens.c \ phone/at/sonyeric.c \ phone/alcatel/alcatel.c \ phone/nokia/dct3/n6110.c \ phone/nokia/dct3/n7110.c \ phone/nokia/dct3/n9210.c \ phone/nokia/dct3/dct3func.c \ phone/nokia/dct4/n3320.c \ phone/nokia/dct4/n3650.c \ phone/nokia/dct4/n6510.c \ phone/nokia/dct4/dct4func.c \ phone/nokia/nauto.c \ phone/nokia/nfunc.c \ phone/nokia/nfuncold.c \ phone/obex/obexgen.c \ phone/symbian/mroutgen.c TARGET = microgammu DESTDIR = $(QPEDIR)/lib OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) +CONFIG = warn_off release console diff --git a/gammu/emb/common/service/gsmring.c b/gammu/emb/common/service/gsmring.c index 5a1ff87..f7f7082 100644 --- a/gammu/emb/common/service/gsmring.c +++ b/gammu/emb/common/service/gsmring.c @@ -83,49 +83,50 @@ GSM_Error savewav(FILE *file, GSM_Ringtone *ringtone) 'R','I','F','F', 0x00,0x00,0x00,0x00, /* Length */ 'W','A','V','E'}; unsigned char FMT_Header[] = {'f','m','t',' ', 0x10,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x44,0xac, 0x00,0x00,0x88,0x58,0x01,0x00,0x02,0x00,0x10,0x00}; unsigned char DATA_Header[] = { 'd','a','t','a', 0x00,0x00,0x00,0x00}; /* Length */ short DATA_Buffer[60000]; long wavfilesize; GSM_RingNote *Note; long i,j,length=0; double phase=0,phase_step; fwrite(&WAV_Header, 1, sizeof(WAV_Header), file); fwrite(&FMT_Header, 1, sizeof(FMT_Header), file); fwrite(&DATA_Header, 1, sizeof(DATA_Header), file); for (i=0;i<ringtone->NoteTone.NrCommands;i++) { if (ringtone->NoteTone.Commands[i].Type == RING_Note) { Note = &ringtone->NoteTone.Commands[i].Note; phase_step = GSM_RingNoteGetFrequency(*Note)*WAV_SAMPLE_RATE*1.5; for (j=0;j<((long)(GSM_RingNoteGetFullDuration(*Note)*WAV_SAMPLE_RATE/70));j++) { - DATA_Buffer[j] = ((int)(sin(phase*PI)*50000)); + /*DATA_Buffer[j] = ((int)(sin(phase*PI)*50000));*/ + DATA_Buffer[j] = ((int)(0.5*50000)); phase = phase + phase_step; length++; } fwrite(&DATA_Buffer,sizeof(short),j,file); } } wavfilesize = sizeof(WAV_Header) + sizeof(FMT_Header) + sizeof(DATA_Header) + length*2; WAV_Header[4] = ((unsigned char)wavfilesize % 256); WAV_Header[5] = ((unsigned char)wavfilesize / 256); WAV_Header[6] = ((unsigned char)wavfilesize / (256*256)); WAV_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); wavfilesize = wavfilesize - 54; DATA_Header[4] = ((unsigned char)wavfilesize % 256); DATA_Header[5] = ((unsigned char)wavfilesize / 256); DATA_Header[6] = ((unsigned char)wavfilesize / (256*256)); DATA_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); fseek( file, 0, SEEK_SET); fwrite(&WAV_Header, 1, sizeof(WAV_Header), file); fwrite(&FMT_Header, 1, sizeof(FMT_Header), file); fwrite(&DATA_Header, 1, sizeof(DATA_Header), file); return ERR_NONE; diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro index 6efc8e7..299de7f 100644 --- a/gammu/emb/gammu/gammu.pro +++ b/gammu/emb/gammu/gammu.pro @@ -1,38 +1,37 @@ ###################################################################### # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 ###################################################################### TEMPLATE = app -CONFIG += console DEPENDPATH += msvc06.mak \ msvc2003.mak \ smsd \ depend/nokia \ depend/siemens \ depend/nokia/dct3trac INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens -CONFIG = qt warn_off release +CONFIG = warn_off release console # Input HEADERS += gammu.h \ sniff.h \ smsd/s_files.h \ smsd/s_mysql.h \ smsd/smsdcore.h \ depend/nokia/dct3.h \ depend/nokia/dct4.h \ depend/siemens/chiffre.h \ depend/siemens/dsiemens.h \ depend/nokia/dct3trac/type-cc.h \ depend/nokia/dct3trac/type-mm.h \ depend/nokia/dct3trac/type-rr.h \ depend/nokia/dct3trac/type-sms.h \ depend/nokia/dct3trac/type-ss.h \ depend/nokia/dct3trac/wmx-gsm.h \ depend/nokia/dct3trac/wmx-list.h \ depend/nokia/dct3trac/wmx-sim.h \ depend/nokia/dct3trac/wmx-util.h \ depend/nokia/dct3trac/wmx.h SOURCES += gammu.c \ sniff.c \ smsd/s_files.c \ diff --git a/gammu/emb/gammu/gammuE.pro b/gammu/emb/gammu/gammuE.pro index a1028cb..5010d8c 100644 --- a/gammu/emb/gammu/gammuE.pro +++ b/gammu/emb/gammu/gammuE.pro @@ -1,55 +1,57 @@ ###################################################################### # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 ###################################################################### TEMPLATE = app DEPENDPATH += msvc06.mak \ msvc2003.mak \ smsd \ depend/nokia \ depend/siemens \ depend/nokia/dct3trac INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens -CONFIG = qt warn_off release +# console # Input HEADERS += gammu.h \ sniff.h \ smsd/s_files.h \ smsd/s_mysql.h \ smsd/smsdcore.h \ depend/nokia/dct3.h \ depend/nokia/dct4.h \ depend/siemens/chiffre.h \ depend/siemens/dsiemens.h \ depend/nokia/dct3trac/type-cc.h \ depend/nokia/dct3trac/type-mm.h \ depend/nokia/dct3trac/type-rr.h \ depend/nokia/dct3trac/type-sms.h \ depend/nokia/dct3trac/type-ss.h \ depend/nokia/dct3trac/wmx-gsm.h \ depend/nokia/dct3trac/wmx-list.h \ depend/nokia/dct3trac/wmx-sim.h \ depend/nokia/dct3trac/wmx-util.h \ depend/nokia/dct3trac/wmx.h SOURCES += gammu.c \ sniff.c \ smsd/s_files.c \ smsd/smsdcore.c \ depend/nokia/dct3.c \ depend/nokia/dct4.c \ depend/siemens/chiffre.c \ depend/siemens/dsiemens.c \ depend/nokia/dct3trac/wmx-gsm.c \ depend/nokia/dct3trac/wmx-list.c \ depend/nokia/dct3trac/wmx-sim.c \ depend/nokia/dct3trac/wmx-util.c \ depend/nokia/dct3trac/wmx.c +LIBS += -L$(QPEDIR)/lib LIBS += -lmicrogammu LIBS += -lbluetooth LIBS += -lsdp LIBS += -lpthread +CONFIG = warn_off release console DESTDIR=$(QPEDIR)/bin OBJECTS_DIR = obj/$(PLATFORM) TARGET = kammu
\ No newline at end of file |