Ilari Liusvaara
3917c41b6b
Merge branch 'rr1-maint'
2013-02-08 00:54:01 +02:00
Ilari Liusvaara
118eb3fbdf
Movie editor: Scrolling fixes
2013-02-08 00:53:49 +02:00
Ilari Liusvaara
891235f5d4
Merge branch 'rr1-maint'
...
Conflicts:
src/platform/wxwidgets/editor-movie.cpp
2013-02-07 18:14:50 +02:00
Ilari Liusvaara
3cbfd67ddb
Movie editor: Scroll to specified frame
2013-02-07 18:05:36 +02:00
Ilari Liusvaara
719d90956d
Movie editor: Truncate movie
2013-02-07 17:52:57 +02:00
Ilari Liusvaara
c6424efa7f
Movie editor: Append multiple frames at once
2013-02-07 17:46:17 +02:00
Ilari Liusvaara
cc31d0ea86
Movie editor: Run to frame function
2013-02-07 17:40:32 +02:00
Ilari Liusvaara
368564d040
Wxwidgets: Repaint the status panel after RW/RO switch
2013-02-07 17:23:58 +02:00
Ilari Liusvaara
1e64ba0c6b
Movie editor: Fix compilation on Win32
2013-02-07 13:29:44 +02:00
Ilari Liusvaara
833a16437f
Win32: Use MoveFileEx to replace the target in one operation
2013-02-07 13:29:38 +02:00
Ilari Liusvaara
5a5968511c
Fix saving unconnected ports to movie
2013-02-05 23:43:18 +02:00
Ilari Liusvaara
90d5fff406
Fix serializing multiple ports
2013-02-05 23:01:29 +02:00
Ilari Liusvaara
91d096984f
Fix serializing multi-controller ports
2013-02-05 22:56:49 +02:00
Ilari Liusvaara
c7272f39d4
Merge branch 'rr1-maint'
2013-02-05 21:47:21 +02:00
Ilari Liusvaara
891d10fcc6
Movie editor: Show movie length
2013-02-05 21:46:35 +02:00
Ilari Liusvaara
feaa527e2a
Movie editor: Reorganize the popup menu a bit
2013-02-05 21:43:53 +02:00
Ilari Liusvaara
f819fe8510
Merge branch 'rr1-maint'
2013-02-05 19:18:13 +02:00
Ilari Liusvaara
43a6d1012f
Movie editor: Locked scrolling mode
2013-02-05 19:17:59 +02:00
Ilari Liusvaara
9f8a7ccdd9
Merge branch 'rr1-maint'
2013-02-05 16:02:30 +02:00
Ilari Liusvaara
ed22b1acab
Movie editor: Fix deleting the leading subframe
2013-02-05 16:02:16 +02:00
Ilari Liusvaara
c0bf2046d4
Merge branch 'rr1-maint'
...
Conflicts:
src/core/audioapi.cpp
2013-02-05 15:57:05 +02:00
Ilari Liusvaara
f7fc235e25
Movie editor: Delete (sub)frame
2013-02-05 15:48:50 +02:00
Ilari Liusvaara
a0682ca5ba
Show nominal and actual sample rates in VU window
2013-02-05 15:48:22 +02:00
Ilari Liusvaara
cc67a7f887
Merge branch 'rr1-maint'
...
Conflicts:
src/core/audioapi.cpp
2013-02-05 01:23:02 +02:00
Ilari Liusvaara
1e29e41577
Fix all sorts of wacky behavior with dummy audio callback
...
This fixes the VU meter when the audio output is set to NULL.
2013-02-05 01:11:52 +02:00
Ilari Liusvaara
463eacedf1
Movie editor: Handle partially stored frames properly
2013-02-05 00:24:36 +02:00
Ilari Liusvaara
4e2db8416d
Merge branch 'rr1-maint'
...
Conflicts:
include/core/movie.hpp
src/platform/wxwidgets/editor-movie.cpp
2013-02-04 21:59:21 +02:00
Ilari Liusvaara
0925eea4cc
Movie editor: Insert frame after
2013-02-04 21:55:27 +02:00
Ilari Liusvaara
4feed2304e
Movie editor: Don't recount the entire movie when change is known
2013-02-04 20:50:56 +02:00
Ilari Liusvaara
62cb6c0727
Movie editor: Sanity-limit number of rows
2013-02-04 20:43:12 +02:00
Ilari Liusvaara
4a1838427e
Movie editor: Allow changing window size
2013-02-04 20:08:00 +02:00
Ilari Liusvaara
590b7fb927
Movie editor: Don't offer out-of-movie edits in menu
...
Out-of-movie edits don't crash, those just won't work.
2013-02-04 19:50:58 +02:00
Ilari Liusvaara
1cc8a3dc92
Merge branch 'rr1-maint'
2013-02-04 19:09:15 +02:00
Ilari Liusvaara
a1b1dd8d65
Movie editor: Show button/axis names in popup menu
2013-02-04 19:05:29 +02:00
Ilari Liusvaara
4e7d763abb
Movie editor: Don't offer popup menu items that make no sense
2013-02-04 18:54:55 +02:00
Ilari Liusvaara
e032662a38
Merge branch 'rr1-maint'
2013-02-04 12:54:20 +02:00
Ilari Liusvaara
ccb4d67074
Movie editor: Popup menu
2013-02-04 12:53:46 +02:00
Ilari Liusvaara
e5b9a62194
Merge branch 'rr1-maint'
...
Conflicts:
src/platform/wxwidgets/editor-movie.cpp
2013-02-04 12:13:55 +02:00
Ilari Liusvaara
124238cea7
Movie editor: Refactoring
2013-02-04 11:55:19 +02:00
Ilari Liusvaara
ea2042acfd
Movie editor: Properly space in presence of axis fields
2013-02-04 08:43:36 +02:00
Ilari Liusvaara
e7fd247c07
Movie editor: Add space before axis fields
2013-02-03 20:50:00 +02:00
Ilari Liusvaara
5eaa80a5f2
Merge branch 'rr1-maint'
...
This merges the basic movie editor functionality
2013-02-03 17:41:09 +02:00
Ilari Liusvaara
ca63bd5bea
Very basic movie editing support
...
This is still very incomplete. More features later.
2013-02-03 16:01:21 +02:00
Ilari Liusvaara
dfe18d2a4d
lsnes rr1-Δ16ε1
2013-02-03 11:53:50 +02:00
Ilari Liusvaara
f9415b0154
Fix loading standard-mode movies
...
When not in extended mode, the checking for movie compatibility read past
the end of poll counter array, potentially leading to a hang.
2013-02-03 06:13:51 +02:00
Ilari Liusvaara
9560c66bf4
Oops, set the sound mode default to 2 not 3
...
The last merge was bad: Instead of mode 2 (round up to nearest integer)
the default got set to mode 3 (multiply rate).
2013-02-02 01:44:35 +02:00
Ilari Liusvaara
c3ae963cbe
Merge branch 'rr1-maint'
...
Conflicts:
src/video/avi.cpp
2013-02-02 01:39:55 +02:00
Ilari Liusvaara
3eea885a64
Change AVI default sound mode
...
Change AVI default sound mode to mode 2 (round up to nearest integer)
if built without SRC support and to mode 5 (high quality 48kHz) if built
with SRC.
2013-02-02 01:39:17 +02:00
Ilari Liusvaara
010c337fa9
Merge branch 'rr1-maint'
2013-02-02 01:23:41 +02:00
Ilari Liusvaara
3539fc508d
Fix paths in bsnes patches
2013-02-02 01:23:34 +02:00
