Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
Isaac Connor
|
1262e831ac
|
rework zmu to load data from the last event with frames when it can't connect to zmc
|
2016-03-29 14:36:16 -04:00 |
|
Isaac Connor
|
0c32ae61ef
|
Merge branch 'master' into fix_coverity_issues
|
2016-03-24 09:42:01 -04:00 |
|
Isaac Connor
|
e12152602b
|
t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas
|
2016-02-22 09:15:45 -05:00 |
Kaarle Ritvanen
|
5b047dc74b
|
zm_event: fix overlap in memcpy buffers
|
2016-02-20 23:58:36 +02:00 |
|
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
arjunrc
|
47b2cdbb96
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:50 -05:00 |
|
Isaac Connor
|
2597bbd9bf
|
use storage object instead of config.dir_events
|
2015-12-15 12:09:34 -05:00 |
Linwood-F
|
987db68452
|
Fix extra image copy; fix options unset of exif toggle
|
2015-08-18 14:39:55 -04:00 |
|
Linwood-F
|
99c8af4a17
|
Bring up to date with master (mostly)
|
2015-08-17 22:52:51 -04:00 |
|
Linwood-F
|
3b9bb6053c
|
Add clarifying comment
|
2015-08-17 22:10:39 -04:00 |
|
Linwood-F
|
9351e1b9d9
|
Incorporate exif switch
|
2015-08-17 22:07:41 -04:00 |
Andrew Bauer
|
59c1b83d4f
|
create embed_exif flag in Monitor class
|
2015-08-16 17:42:12 -05:00 |
|
Andrew Bauer
|
5b0288e5f5
|
use frame_type instead of score in conditional
|
2015-08-14 07:03:08 -05:00 |
|
Andrew Bauer
|
19174adfa1
|
add frame_type to debug message
|
2015-08-13 20:47:14 -05:00 |
|
Andrew Bauer
|
14dabb095c
|
set scroe to zero if less than zero
|
2015-08-13 18:06:20 -05:00 |
|
Isaac Connor
|
95087beeb9
|
use return value of stat instead of just checking errno. This has the added benefit of catching other errors when stating
|
2015-08-12 11:00:41 -04:00 |
|
Linwood-F
|
72a92ee9d5
|
Add exif to jpg images saved
|
2015-07-23 19:34:39 -04:00 |
rwg0
|
422020a3b2
|
Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps
|
2015-04-22 22:11:33 +01:00 |
Isaac Connor
|
0bea381510
|
sendfile tricks
|
2015-02-24 09:20:55 -05:00 |
|
Andrew Bauer
|
9163536219
|
Merge pull request #358 from knnniggett/prevbutton
Fix prev button while in gapless mode. All buttons tested and working.
|
2014-07-04 10:33:05 -05:00 |
|
Isaac Connor
|
00aad4a128
|
frame_count should be an integer so don't use NULL
|
2014-05-05 13:06:58 -04:00 |
|
Isaac Connor
|
a8929914bb
|
add a NULL test for frame_coutn before calling atoi.
|
2014-05-05 11:29:09 -04:00 |
|
Andrew Bauer
|
b126ca3e01
|
modify play button
|
2014-03-30 11:18:14 -05:00 |
|
Andrew Bauer
|
3f7f398210
|
rework prev and next buttons
|
2014-03-28 17:18:34 -05:00 |
|
Andrew Bauer
|
264b98548f
|
Fix prev button while in gapless mode. All buttons tested and working.
|
2014-03-25 17:12:26 -05:00 |
|
Andrew Bauer
|
d2be7d4cd8
|
Update zm_event.cpp
Commit 79af2adaa0 attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
|
2014-03-25 07:01:40 -05:00 |
David Nesting
|
79c7a1b255
|
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
|
2013-10-26 18:41:12 -07:00 |
|
Andrew Bauer
|
79af2adaa0
|
When loading a new event, always set the current frame id to the first frame rather than the last
|
2013-10-09 07:32:27 -05:00 |
mastertheknife
|
a9e886aea2
|
Fix small zipped images bug introduced by commit e12a9dc408
|
2013-10-06 06:35:56 +03:00 |
|
mastertheknife
|
e12a9dc408
|
Fixed compilation failure when zlib is not available
|
2013-10-04 23:20:39 +03:00 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |