Merge conflict fixed

martinmarinov · martinmarinov · commit e7d342c34054 · 2014-01-02T21:43:08.000+02:00
diff --git a/TSDRPlugin_Mirics/src/TSDRPlugin_Mirics.c b/TSDRPlugin_Mirics/src/TSDRPlugin_Mirics.c
@@ -117,17 +117,11 @@ void samplepollthread(void * ctx) {
 			outbuf[i] = val / 32767.0;
 		}
 
-<<<<<<< HEAD
 		//mir_sdr_SetSyncUpdatePeriod(sps * SAMPLES_TO_PROCESS_AT_ONCE);
 		//mir_sdr_SetSyncUpdateSampleNum(fs+sps * SAMPLES_TO_PROCESS_AT_ONCE);
 
 		cb_add(&circbuf, outbuf, outbufsize);
-=======
-		mir_sdr_SetSyncUpdatePeriod(sps * SAMPLES_TO_PROCESS_AT_ONCE);
-		mir_sdr_SetSyncUpdateSampleNum(fs+sps * SAMPLES_TO_PROCESS_AT_ONCE);
 
-		cb(outbuf, outbufsize, ctx);
->>>>>>> 82ad738f1440fbbecd19dc2f5f1851467066e34a
 	}
 
 	free(outbuf);

Original file line number	Diff line number	Diff line change
`@@ -117,17 +117,11 @@ void samplepollthread(void * ctx) {`
`117`	`117`	`outbuf[i] = val / 32767.0;`
`118`	`118`	`}`
`119`	`119`
`120`		`-<<<<<<< HEAD`
`121`	`120`	`//mir_sdr_SetSyncUpdatePeriod(sps * SAMPLES_TO_PROCESS_AT_ONCE);`
`122`	`121`	`//mir_sdr_SetSyncUpdateSampleNum(fs+sps * SAMPLES_TO_PROCESS_AT_ONCE);`
`123`	`122`
`124`	`123`	`cb_add(&circbuf, outbuf, outbufsize);`
`125`		`-=======`
`126`		`- mir_sdr_SetSyncUpdatePeriod(sps * SAMPLES_TO_PROCESS_AT_ONCE);`
`127`		`- mir_sdr_SetSyncUpdateSampleNum(fs+sps * SAMPLES_TO_PROCESS_AT_ONCE);`
`128`	`124`
`129`		`- cb(outbuf, outbufsize, ctx);`
`130`		`->>>>>>> 82ad738f1440fbbecd19dc2f5f1851467066e34a`
`131`	`125`	`}`
`132`	`126`
`133`	`127`	`free(outbuf);`