-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 \ | |||
152 | protocol/nokia/fbus2.c \ | 152 | protocol/nokia/fbus2.c \ |
153 | protocol/nokia/phonet.c \ | 153 | protocol/nokia/phonet.c \ |
154 | protocol/obex/obex.c \ | 154 | protocol/obex/obex.c \ |
155 | protocol/symbian/mrouter.c \ | 155 | protocol/symbian/mrouter.c \ |
156 | phone/pfunc.c \ | 156 | phone/pfunc.c \ |
157 | phone/at/atgen.c \ | 157 | phone/at/atgen.c \ |
158 | phone/at/siemens.c \ | 158 | phone/at/siemens.c \ |
159 | phone/at/sonyeric.c \ | 159 | phone/at/sonyeric.c \ |
160 | phone/alcatel/alcatel.c \ | 160 | phone/alcatel/alcatel.c \ |
161 | phone/nokia/dct3/n6110.c \ | 161 | phone/nokia/dct3/n6110.c \ |
162 | phone/nokia/dct3/n7110.c \ | 162 | phone/nokia/dct3/n7110.c \ |
163 | phone/nokia/dct3/n9210.c \ | 163 | phone/nokia/dct3/n9210.c \ |
164 | phone/nokia/dct3/dct3func.c \ | 164 | phone/nokia/dct3/dct3func.c \ |
165 | phone/nokia/dct4/n3320.c \ | 165 | phone/nokia/dct4/n3320.c \ |
166 | phone/nokia/dct4/n3650.c \ | 166 | phone/nokia/dct4/n3650.c \ |
167 | phone/nokia/dct4/n6510.c \ | 167 | phone/nokia/dct4/n6510.c \ |
168 | phone/nokia/dct4/dct4func.c \ | 168 | phone/nokia/dct4/dct4func.c \ |
169 | phone/nokia/nauto.c \ | 169 | phone/nokia/nauto.c \ |
170 | phone/nokia/nfunc.c \ | 170 | phone/nokia/nfunc.c \ |
171 | phone/nokia/nfuncold.c \ | 171 | phone/nokia/nfuncold.c \ |
172 | phone/obex/obexgen.c \ | 172 | phone/obex/obexgen.c \ |
173 | phone/symbian/mroutgen.c | 173 | phone/symbian/mroutgen.c |
174 | 174 | ||
175 | TARGET = microgammu | 175 | TARGET = microgammu |
176 | CONFIG += console | 176 | CONFIG = warn_off release console |
177 | DESTDIR = ../../../bin | 177 | DESTDIR = ../../../bin |
178 | OBJECTS_DIR = obj/unix | 178 | OBJECTS_DIR = obj/unix |
179 | MOC_DIR = moc/unix | 179 | MOC_DIR = moc/unix |
180 | 180 | ||
181 | unix: { | 181 | unix: { |
182 | SOURCES += device/serial/ser_unx.c | 182 | SOURCES += device/serial/ser_unx.c |
183 | } | 183 | } |
184 | win32:{ | 184 | win32:{ |
185 | SOURCES += device/serial/ser_w32.c | 185 | SOURCES += device/serial/ser_w32.c |
186 | } | 186 | } |
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 \ | |||
156 | protocol/symbian/mrouter.c \ | 156 | protocol/symbian/mrouter.c \ |
157 | phone/pfunc.c \ | 157 | phone/pfunc.c \ |
158 | phone/at/atgen.c \ | 158 | phone/at/atgen.c \ |
159 | phone/at/siemens.c \ | 159 | phone/at/siemens.c \ |
160 | phone/at/sonyeric.c \ | 160 | phone/at/sonyeric.c \ |
161 | phone/alcatel/alcatel.c \ | 161 | phone/alcatel/alcatel.c \ |
162 | phone/nokia/dct3/n6110.c \ | 162 | phone/nokia/dct3/n6110.c \ |
163 | phone/nokia/dct3/n7110.c \ | 163 | phone/nokia/dct3/n7110.c \ |
164 | phone/nokia/dct3/n9210.c \ | 164 | phone/nokia/dct3/n9210.c \ |
165 | phone/nokia/dct3/dct3func.c \ | 165 | phone/nokia/dct3/dct3func.c \ |
166 | phone/nokia/dct4/n3320.c \ | 166 | phone/nokia/dct4/n3320.c \ |
167 | phone/nokia/dct4/n3650.c \ | 167 | phone/nokia/dct4/n3650.c \ |
168 | phone/nokia/dct4/n6510.c \ | 168 | phone/nokia/dct4/n6510.c \ |
169 | phone/nokia/dct4/dct4func.c \ | 169 | phone/nokia/dct4/dct4func.c \ |
170 | phone/nokia/nauto.c \ | 170 | phone/nokia/nauto.c \ |
171 | phone/nokia/nfunc.c \ | 171 | phone/nokia/nfunc.c \ |
172 | phone/nokia/nfuncold.c \ | 172 | phone/nokia/nfuncold.c \ |
173 | phone/obex/obexgen.c \ | 173 | phone/obex/obexgen.c \ |
174 | phone/symbian/mroutgen.c | 174 | phone/symbian/mroutgen.c |
175 | 175 | ||
176 | TARGET = microgammu | 176 | TARGET = microgammu |
177 | DESTDIR = $(QPEDIR)/lib | 177 | DESTDIR = $(QPEDIR)/lib |
178 | OBJECTS_DIR = obj/$(PLATFORM) | 178 | OBJECTS_DIR = obj/$(PLATFORM) |
179 | MOC_DIR = moc/$(PLATFORM) | 179 | MOC_DIR = moc/$(PLATFORM) |
180 | 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) | |||
83 | 'R','I','F','F', | 83 | 'R','I','F','F', |
84 | 0x00,0x00,0x00,0x00,/* Length */ | 84 | 0x00,0x00,0x00,0x00,/* Length */ |
85 | 'W','A','V','E'}; | 85 | 'W','A','V','E'}; |
86 | unsigned char FMT_Header[] = {'f','m','t',' ', | 86 | unsigned char FMT_Header[] = {'f','m','t',' ', |
87 | 0x10,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x44,0xac, | 87 | 0x10,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x44,0xac, |
88 | 0x00,0x00,0x88,0x58,0x01,0x00,0x02,0x00,0x10,0x00}; | 88 | 0x00,0x00,0x88,0x58,0x01,0x00,0x02,0x00,0x10,0x00}; |
89 | unsigned char DATA_Header[] = { | 89 | unsigned char DATA_Header[] = { |
90 | 'd','a','t','a', | 90 | 'd','a','t','a', |
91 | 0x00,0x00,0x00,0x00};/* Length */ | 91 | 0x00,0x00,0x00,0x00};/* Length */ |
92 | short DATA_Buffer[60000]; | 92 | short DATA_Buffer[60000]; |
93 | long wavfilesize; | 93 | long wavfilesize; |
94 | GSM_RingNote *Note; | 94 | GSM_RingNote *Note; |
95 | long i,j,length=0; | 95 | long i,j,length=0; |
96 | double phase=0,phase_step; | 96 | double phase=0,phase_step; |
97 | 97 | ||
98 | fwrite(&WAV_Header, 1, sizeof(WAV_Header),file); | 98 | fwrite(&WAV_Header, 1, sizeof(WAV_Header),file); |
99 | fwrite(&FMT_Header, 1, sizeof(FMT_Header),file); | 99 | fwrite(&FMT_Header, 1, sizeof(FMT_Header),file); |
100 | fwrite(&DATA_Header, 1, sizeof(DATA_Header),file); | 100 | fwrite(&DATA_Header, 1, sizeof(DATA_Header),file); |
101 | 101 | ||
102 | for (i=0;i<ringtone->NoteTone.NrCommands;i++) { | 102 | for (i=0;i<ringtone->NoteTone.NrCommands;i++) { |
103 | if (ringtone->NoteTone.Commands[i].Type == RING_Note) { | 103 | if (ringtone->NoteTone.Commands[i].Type == RING_Note) { |
104 | Note = &ringtone->NoteTone.Commands[i].Note; | 104 | Note = &ringtone->NoteTone.Commands[i].Note; |
105 | phase_step = GSM_RingNoteGetFrequency(*Note)*WAV_SAMPLE_RATE*1.5; | 105 | phase_step = GSM_RingNoteGetFrequency(*Note)*WAV_SAMPLE_RATE*1.5; |
106 | for (j=0;j<((long)(GSM_RingNoteGetFullDuration(*Note)*WAV_SAMPLE_RATE/70));j++) { | 106 | for (j=0;j<((long)(GSM_RingNoteGetFullDuration(*Note)*WAV_SAMPLE_RATE/70));j++) { |
107 | DATA_Buffer[j] = ((int)(sin(phase*PI)*50000)); | 107 | /*DATA_Buffer[j] = ((int)(sin(phase*PI)*50000));*/ |
108 | DATA_Buffer[j] = ((int)(0.5*50000)); | ||
108 | phase = phase + phase_step; | 109 | phase = phase + phase_step; |
109 | length++; | 110 | length++; |
110 | } | 111 | } |
111 | fwrite(&DATA_Buffer,sizeof(short),j,file); | 112 | fwrite(&DATA_Buffer,sizeof(short),j,file); |
112 | } | 113 | } |
113 | } | 114 | } |
114 | 115 | ||
115 | wavfilesize = sizeof(WAV_Header) + sizeof(FMT_Header) + sizeof(DATA_Header) + length*2; | 116 | wavfilesize = sizeof(WAV_Header) + sizeof(FMT_Header) + sizeof(DATA_Header) + length*2; |
116 | WAV_Header[4] = ((unsigned char)wavfilesize % 256); | 117 | WAV_Header[4] = ((unsigned char)wavfilesize % 256); |
117 | WAV_Header[5] = ((unsigned char)wavfilesize / 256); | 118 | WAV_Header[5] = ((unsigned char)wavfilesize / 256); |
118 | WAV_Header[6] = ((unsigned char)wavfilesize / (256*256)); | 119 | WAV_Header[6] = ((unsigned char)wavfilesize / (256*256)); |
119 | WAV_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); | 120 | WAV_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); |
120 | wavfilesize = wavfilesize - 54; | 121 | wavfilesize = wavfilesize - 54; |
121 | DATA_Header[4] = ((unsigned char)wavfilesize % 256); | 122 | DATA_Header[4] = ((unsigned char)wavfilesize % 256); |
122 | DATA_Header[5] = ((unsigned char)wavfilesize / 256); | 123 | DATA_Header[5] = ((unsigned char)wavfilesize / 256); |
123 | DATA_Header[6] = ((unsigned char)wavfilesize / (256*256)); | 124 | DATA_Header[6] = ((unsigned char)wavfilesize / (256*256)); |
124 | DATA_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); | 125 | DATA_Header[7] = ((unsigned char)wavfilesize / (256*256*256)); |
125 | 126 | ||
126 | fseek( file, 0, SEEK_SET); | 127 | fseek( file, 0, SEEK_SET); |
127 | fwrite(&WAV_Header, 1, sizeof(WAV_Header),file); | 128 | fwrite(&WAV_Header, 1, sizeof(WAV_Header),file); |
128 | fwrite(&FMT_Header, 1, sizeof(FMT_Header),file); | 129 | fwrite(&FMT_Header, 1, sizeof(FMT_Header),file); |
129 | fwrite(&DATA_Header, 1, sizeof(DATA_Header),file); | 130 | fwrite(&DATA_Header, 1, sizeof(DATA_Header),file); |
130 | 131 | ||
131 | return ERR_NONE; | 132 | 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 @@ | |||
1 | ###################################################################### | 1 | ###################################################################### |
2 | # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 | 2 | # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 |
3 | ###################################################################### | 3 | ###################################################################### |
4 | 4 | ||
5 | TEMPLATE = app | 5 | TEMPLATE = app |
6 | CONFIG += console | ||
7 | DEPENDPATH += msvc06.mak \ | 6 | DEPENDPATH += msvc06.mak \ |
8 | msvc2003.mak \ | 7 | msvc2003.mak \ |
9 | smsd \ | 8 | smsd \ |
10 | depend/nokia \ | 9 | depend/nokia \ |
11 | depend/siemens \ | 10 | depend/siemens \ |
12 | depend/nokia/dct3trac | 11 | depend/nokia/dct3trac |
13 | INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens | 12 | INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens |
14 | CONFIG = qt warn_off release | 13 | CONFIG = warn_off release console |
15 | # Input | 14 | # Input |
16 | 15 | ||
17 | HEADERS += gammu.h \ | 16 | HEADERS += gammu.h \ |
18 | sniff.h \ | 17 | sniff.h \ |
19 | smsd/s_files.h \ | 18 | smsd/s_files.h \ |
20 | smsd/s_mysql.h \ | 19 | smsd/s_mysql.h \ |
21 | smsd/smsdcore.h \ | 20 | smsd/smsdcore.h \ |
22 | depend/nokia/dct3.h \ | 21 | depend/nokia/dct3.h \ |
23 | depend/nokia/dct4.h \ | 22 | depend/nokia/dct4.h \ |
24 | depend/siemens/chiffre.h \ | 23 | depend/siemens/chiffre.h \ |
25 | depend/siemens/dsiemens.h \ | 24 | depend/siemens/dsiemens.h \ |
26 | depend/nokia/dct3trac/type-cc.h \ | 25 | depend/nokia/dct3trac/type-cc.h \ |
27 | depend/nokia/dct3trac/type-mm.h \ | 26 | depend/nokia/dct3trac/type-mm.h \ |
28 | depend/nokia/dct3trac/type-rr.h \ | 27 | depend/nokia/dct3trac/type-rr.h \ |
29 | depend/nokia/dct3trac/type-sms.h \ | 28 | depend/nokia/dct3trac/type-sms.h \ |
30 | depend/nokia/dct3trac/type-ss.h \ | 29 | depend/nokia/dct3trac/type-ss.h \ |
31 | depend/nokia/dct3trac/wmx-gsm.h \ | 30 | depend/nokia/dct3trac/wmx-gsm.h \ |
32 | depend/nokia/dct3trac/wmx-list.h \ | 31 | depend/nokia/dct3trac/wmx-list.h \ |
33 | depend/nokia/dct3trac/wmx-sim.h \ | 32 | depend/nokia/dct3trac/wmx-sim.h \ |
34 | depend/nokia/dct3trac/wmx-util.h \ | 33 | depend/nokia/dct3trac/wmx-util.h \ |
35 | depend/nokia/dct3trac/wmx.h | 34 | depend/nokia/dct3trac/wmx.h |
36 | SOURCES += gammu.c \ | 35 | SOURCES += gammu.c \ |
37 | sniff.c \ | 36 | sniff.c \ |
38 | smsd/s_files.c \ | 37 | 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 @@ | |||
1 | ###################################################################### | 1 | ###################################################################### |
2 | # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 | 2 | # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 |
3 | ###################################################################### | 3 | ###################################################################### |
4 | 4 | ||
5 | TEMPLATE = app | 5 | TEMPLATE = app |
6 | DEPENDPATH += msvc06.mak \ | 6 | DEPENDPATH += msvc06.mak \ |
7 | msvc2003.mak \ | 7 | msvc2003.mak \ |
8 | smsd \ | 8 | smsd \ |
9 | depend/nokia \ | 9 | depend/nokia \ |
10 | depend/siemens \ | 10 | depend/siemens \ |
11 | depend/nokia/dct3trac | 11 | depend/nokia/dct3trac |
12 | INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens | 12 | INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens |
13 | CONFIG = qt warn_off release | 13 | # console |
14 | # Input | 14 | # Input |
15 | 15 | ||
16 | HEADERS += gammu.h \ | 16 | HEADERS += gammu.h \ |
17 | sniff.h \ | 17 | sniff.h \ |
18 | smsd/s_files.h \ | 18 | smsd/s_files.h \ |
19 | smsd/s_mysql.h \ | 19 | smsd/s_mysql.h \ |
20 | smsd/smsdcore.h \ | 20 | smsd/smsdcore.h \ |
21 | depend/nokia/dct3.h \ | 21 | depend/nokia/dct3.h \ |
22 | depend/nokia/dct4.h \ | 22 | depend/nokia/dct4.h \ |
23 | depend/siemens/chiffre.h \ | 23 | depend/siemens/chiffre.h \ |
24 | depend/siemens/dsiemens.h \ | 24 | depend/siemens/dsiemens.h \ |
25 | depend/nokia/dct3trac/type-cc.h \ | 25 | depend/nokia/dct3trac/type-cc.h \ |
26 | depend/nokia/dct3trac/type-mm.h \ | 26 | depend/nokia/dct3trac/type-mm.h \ |
27 | depend/nokia/dct3trac/type-rr.h \ | 27 | depend/nokia/dct3trac/type-rr.h \ |
28 | depend/nokia/dct3trac/type-sms.h \ | 28 | depend/nokia/dct3trac/type-sms.h \ |
29 | depend/nokia/dct3trac/type-ss.h \ | 29 | depend/nokia/dct3trac/type-ss.h \ |
30 | depend/nokia/dct3trac/wmx-gsm.h \ | 30 | depend/nokia/dct3trac/wmx-gsm.h \ |
31 | depend/nokia/dct3trac/wmx-list.h \ | 31 | depend/nokia/dct3trac/wmx-list.h \ |
32 | depend/nokia/dct3trac/wmx-sim.h \ | 32 | depend/nokia/dct3trac/wmx-sim.h \ |
33 | depend/nokia/dct3trac/wmx-util.h \ | 33 | depend/nokia/dct3trac/wmx-util.h \ |
34 | depend/nokia/dct3trac/wmx.h | 34 | depend/nokia/dct3trac/wmx.h |
35 | SOURCES += gammu.c \ | 35 | SOURCES += gammu.c \ |
36 | sniff.c \ | 36 | sniff.c \ |
37 | smsd/s_files.c \ | 37 | smsd/s_files.c \ |
38 | smsd/smsdcore.c \ | 38 | smsd/smsdcore.c \ |
39 | depend/nokia/dct3.c \ | 39 | depend/nokia/dct3.c \ |
40 | depend/nokia/dct4.c \ | 40 | depend/nokia/dct4.c \ |
41 | depend/siemens/chiffre.c \ | 41 | depend/siemens/chiffre.c \ |
42 | depend/siemens/dsiemens.c \ | 42 | depend/siemens/dsiemens.c \ |
43 | depend/nokia/dct3trac/wmx-gsm.c \ | 43 | depend/nokia/dct3trac/wmx-gsm.c \ |
44 | depend/nokia/dct3trac/wmx-list.c \ | 44 | depend/nokia/dct3trac/wmx-list.c \ |
45 | depend/nokia/dct3trac/wmx-sim.c \ | 45 | depend/nokia/dct3trac/wmx-sim.c \ |
46 | depend/nokia/dct3trac/wmx-util.c \ | 46 | depend/nokia/dct3trac/wmx-util.c \ |
47 | depend/nokia/dct3trac/wmx.c | 47 | depend/nokia/dct3trac/wmx.c |
48 | 48 | ||
49 | LIBS += -L$(QPEDIR)/lib | ||
49 | LIBS += -lmicrogammu | 50 | LIBS += -lmicrogammu |
50 | LIBS += -lbluetooth | 51 | LIBS += -lbluetooth |
51 | LIBS += -lsdp | 52 | LIBS += -lsdp |
52 | LIBS += -lpthread | 53 | LIBS += -lpthread |
54 | CONFIG = warn_off release console | ||
53 | DESTDIR=$(QPEDIR)/bin | 55 | DESTDIR=$(QPEDIR)/bin |
54 | OBJECTS_DIR = obj/$(PLATFORM) | 56 | OBJECTS_DIR = obj/$(PLATFORM) |
55 | TARGET = kammu \ No newline at end of file | 57 | TARGET = kammu \ No newline at end of file |