dmlib: edmain.cpp annotate

annotate edmain.cpp @ 391:28a74940f2b6

More work on the editor.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 19 Oct 2012 04:30:24 +0300
parents	e5220ff48bc8
children	5137db55f00b

rev	line source
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 //
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 // Demo Editor -- Main program
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 // (C) Copyright 2012 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 //
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 #include <SDL.h>
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "dmengine.h"
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "edmain.h"
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include <QSettings>
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include <QGLWidget>
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 int main(int argc, char *argv[])
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 dmVerbosity = 5;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 QApplication app(argc, argv);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 app.setOrganizationName("TNSP");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 app.setOrganizationDomain("tnsp.org");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 app.setApplicationName(PROGRAM_NAME);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 app.setApplicationVersion(PROGRAM_VERSION);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 DemoEditor mainWin;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 mainWin.show();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 return app.exec();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 void engineAudioCallback(void userdata, Uint8 stream, int len)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 DMEngineData engine = (DMEngineData ) userdata;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 if (engine->paused)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 memset(stream, 0, len);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 else
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 #ifdef DM_USE_JSS
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 if (engine->dev != NULL)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 jvmRenderAudio(engine->dev, stream,
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 len / jvmGetSampleSize(engine->dev));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 #endif
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 #ifdef DM_USE_TREMOR
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 if (engine->audioPos + len >= engine->audioRes->rdataSize)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 engine->exitFlag = true;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 else
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 memcpy(stream, (Uint8 *) engine->audioRes->rdata + engine->audioPos, len);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 engine->audioPos += len;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 #endif
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 int DemoEditor::reopenResources()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 int err;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 if ((err = dmres_init(&engine.resources, engine.optPackFilename, engine.optDataPath,
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 engine.optResFlags, engineClassifier)) != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 dmError("Could not initialize resource manager: %d, %s.\n",
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 err, dmErrorStr(err));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 return err;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 int DemoEditor::loadResources()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 int err, loaded, total;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 err = dmres_preload(engine.resources, true, &loaded, &total);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 while ((err = dmres_preload(engine.resources, false, &loaded, &total)) == DMERR_PROGRESS)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 // Show a nice progress bar while loading
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 if (total > 0 && (loaded % 2) == 0)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 /*
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 if ((err = engineShowProgress(loaded, total)) != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 return err;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 */
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 return DMERR_OK;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 DemoEditor::DemoEditor()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 int err;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 resize(1024, 768);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 setWindowTitle(QCoreApplication::applicationName());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	102 changed = FALSE;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	103 initSDL = FALSE;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	104 tl = NULL;
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 memset(&engine, 0, sizeof(engine));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 // Pre-initialization
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 if ((err = demoPreInit(&engine)) != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 // Initialize SDL components
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 dmPrint(1, "Initializing libSDL.\n");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 if (SDL_Init(SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| SDL_INIT_TIMER) != 0)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 dmError("Could not initialize SDL: %s\n", SDL_GetError());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 initSDL = true;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 // Initialize audio parts
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 if (engine.optAfmt.freq == 0 && engine.optAfmt.channels == 0)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 // Defaults, if none seem to be set
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 engine.optAfmt.freq = 44100;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 engine.optAfmt.format = AUDIO_S16SYS;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 engine.optAfmt.channels = 2;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 engine.optAfmt.samples = engine.optAfmt.freq / 16;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 #ifdef DM_USE_JSS
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 jssInit();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 switch (engine.optAfmt.format)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 case AUDIO_S16SYS:
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 engine.jss_format = JSS_AUDIO_S16;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 break;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 case AUDIO_U16SYS:
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 engine.jss_format = JSS_AUDIO_U16;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 break;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 case AUDIO_S8:
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 engine.jss_format = JSS_AUDIO_S8;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 break;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 case AUDIO_U8:
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 engine.jss_format = JSS_AUDIO_U8;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 break;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n",
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150 engine.jss_format, engine.optAfmt.channels, engine.optAfmt.freq);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 if ((engine.dev =
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 jvmInit(engine.jss_format, engine.optAfmt.channels,
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 engine.optAfmt.freq, JMIX_AUTO)) == NULL)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 dmError("jvmInit() returned NULL, voi perkele.\n");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 if ((engine.plr = jmpInit(engine.dev)) == NULL)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 dmError("jmpInit() returned NULL\n");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 #endif
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 // Initialize SDL audio
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 dmPrint(1, "Trying to init SDL audio with: fmt=%d, chn=%d, freq=%d\n",
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 engine.optAfmt.format, engine.optAfmt.channels,
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 engine.optAfmt.freq);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 engine.optAfmt.callback = engineAudioCallback;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 if (SDL_OpenAudio(&engine.optAfmt, NULL) < 0)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 dmError("Couldn't open SDL audio: %s\n", SDL_GetError());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 // Initialize SDL video
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 if (engine.demoInitPreVideo != NULL &&
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 dmError("demoInitPreVideo() failed, %d: %s\n", err, dmErrorStr(err));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 dmPrint(1, "Initializing SDL video %d x %d x %dbpp, flags=0x%08x\n",
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 engine.optScrWidth, engine.optScrHeight, engine.optBitDepth, engine.optVFlags);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 engine.screen = SDL_CreateRGBSurface(SDL_SWSURFACE, engine.optScrWidth, engine.optScrHeight, engine.optBitDepth, 0, 0, 0, 0);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 if (engine.screen == NULL)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194 dmError("Could not allocate video backbuffer surface.\n");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 if (engine.demoInitPostVideo != NULL &&
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 dmError("demoInitPostVideo() failed, %d: %s\n", err, dmErrorStr(err));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 goto error_exit;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 error_exit:
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 // Setup GUI elements
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 createMainGUI();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210 createNewFile();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 settingsRestore();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 // view->setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	216 initEffectsAndResources();
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 statusMsg("Application started.");
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 DemoEditor::~DemoEditor()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 {
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	223 statusMsg("Shutting down.");
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 settingsSave();
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	226 delete demoView;
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	227 delete tl;
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 historyReset();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 if (engine.screen)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 SDL_FreeSurface(engine.screen);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233 SDL_LockAudio();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 SDL_PauseAudio(1);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 #ifdef DM_USE_JSS
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 jmpClose(engine.plr);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 jvmClose(engine.dev);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 jssClose();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 #endif
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240 SDL_UnlockAudio();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	242 shutdownEffectsAndResources();
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	243
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	244 if (initSDL)
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	245 SDL_Quit();
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	246 }
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	247
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	248
391 28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	249 // Return audio track duration in milliseconds
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	250 int DemoEditor::getAudioTrackDuration()
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	251 {
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	252 return timelineAudioTrack->getDuration();
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	253 }
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	254
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	255
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	256 int DemoEditor::getTimelineDuration()
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	257 {
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	258 return getAudioTrackDuration();
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	259 }
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	260
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	261
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	262 void DemoEditor::updateTimelineView()
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	263 {
391 28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	264 timelineAudioTrack->setOffset(currViewOffset);
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	265 timelineAudioTrack->setScale(currViewScale);
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	266 // timelineAudioTrack->setTime(currFrameTime);
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	267
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	268 timelineScrollBar->setRange(0, getTimelineDuration() - timelineAudioTrack->getScaledWidth());
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	269 timelineScrollBar->setValue(currViewOffset);
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	270 }
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	271
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	272
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	273 void DemoEditor::actionTimelineScrollChanged(int value)
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	274 {
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	275 currViewOffset = value;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	276 updateTimelineView();
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	277 }
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	278
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	279
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	280 void DemoEditor::actionOffsetChanged(float value)
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	281 {
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	282 currViewOffset = value;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	283 updateTimelineView();
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	284 }
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	285
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	286
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	287 void DemoEditor::actionTimeChanged(float value)
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	288 {
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	289 currFrameTime = value;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	290 updateTimelineView();
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	291 }
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	292
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	293
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	294 int DemoEditor::initEffectsAndResources()
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	295 {
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	296 int err;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	297
391 28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	298 currViewOffset = 0;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	299 currFrameTime = 0;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	300 currViewScale = 1.0f;
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	301
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	302 // Initialize resource subsystem
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	303 statusMsg("Initializing resources subsystem.");
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	304 if ((err = reopenResources()) != DMERR_OK)
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	305 return err;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	306
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	307 // Load resources
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	308 statusMsg("Loading resources, please wait...");
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	309 if ((err = loadResources()) != DMERR_OK)
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	310 {
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	311 dmError("Error loading resources, %d: %s.\n", err, dmErrorStr(err));
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	312 return err;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	313 }
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	314
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	315
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	316 // Final initializations
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	317 statusMsg("Initializing custom demo data.");
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	318 if ((err = engine.demoInit(&engine)) != DMERR_OK)
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	319 {
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	320 dmError("Failure in demoInit(), %d: %s\n",
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	321 err, dmErrorStr(err));
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	322 return err;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	323 }
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	324
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	325 // Initialize effects
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	326 statusMsg("Initializing effects ...");
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	327 if ((err = engineInitializeEffects(&engine)) != DMERR_OK)
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	328 {
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	329 dmError("Effects initialization failed, %d: %s\n",
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	330 err, dmErrorStr(err));
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	331 return err;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	332 }
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	333
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	334 // Etc.
391 28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	335 demoView->setEngineData(&engine);
28a74940f2b6 More work on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 384 diff changeset	336 timelineAudioTrack->setWaveform(
384 e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	337 engine.audioRes->rdata, engine.audioRes->rdataSize,
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	338 engine.optAfmt.format, engine.optAfmt.channels,
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	339 engine.optAfmt.freq);
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	340
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	341 updateTimelineView();
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	342 updateMenuStates();
e5220ff48bc8 Slowly working on the editor. Matti Hamalainen <ccr@tnsp.org> parents: 379 diff changeset	343 update();
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	344 return DMERR_OK;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	345 }
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	346
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	347
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	348 void DemoEditor::shutdownEffectsAndResources()
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	349 {
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 dmFreeTimeline(engine.tl);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 dmFreePreparedTimelineData(engine.ptl);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 engineShutdownEffects(&engine);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 dmres_close(engine.resources);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 if (engine.demoShutdown != NULL)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 engine.demoShutdown(&engine);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	360 void DemoEditor::createNewFile()
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	362 delete tl;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	363 tl = new TimelineObject();
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	364
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 update();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 historyReset();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 changed = false;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368 updateMenuStates();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 void DemoEditor::readFromFile(QString filename)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	374 TimelineObject *tmp = new TimelineObject();
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 int ret = tmp->load(filename);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 if (ret != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	378 showFileErrorDialog("Loading demo blob file "+ filename, ret);
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 delete tmp;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 else
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	383 delete tl;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	384 tl = tmp;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	385
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	386 update();
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	387 historyReset();
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	388 changed = false;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	389 updateMenuStates();
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 void DemoEditor::saveToFile(QString filename)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	396 int ret = tl->save(filename);
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 if (ret != DMERR_OK)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	399 showFileErrorDialog("Saving demo blob file "+ filename, ret);
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 updateMenuStates();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 void DemoEditor::settingsRestore()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 QSettings s;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 restoreGeometry(s.value("windowGeometry").toByteArray());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 restoreState(s.value("windowState").toByteArray());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 void DemoEditor::settingsSave()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418 QSettings s;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 s.setValue("windowGeometry", saveGeometry());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 s.setValue("windowState", saveState());
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 //
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 // Edit history functionality
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 //
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 void DemoEditor::historyReset()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 changed = false;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 undoHistoryPos = -1;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 undoHistoryMax = DOC_UNDO_MAX;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 undoHistory.clear();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 void DemoEditor::historyPush(QString description)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 if (!undoHistory.isEmpty() && undoHistory.last()->state == "-")
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442 delete undoHistory.takeLast();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 while (undoHistory.size() >= undoHistoryMax)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 delete undoHistory.takeFirst();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	448 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	450 TimelineObject *copy = new TimelineObject(tl);
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 copy->state = description;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452 undoHistory.append(copy);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456 void DemoEditor::historyTop()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 {
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	458 TimelineObject *copy = new TimelineObject(tl);
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 copy->state = "-";
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 undoHistory.append(copy);
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462 undoHistoryPos = undoHistory.size() - 1;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 changed = true;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 updateMenuStates();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465 update();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 void DemoEditor::historyPop()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 if (!undoHistory.isEmpty())
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473 delete undoHistory.takeLast();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 void DemoEditor::performRedo()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 if (undoHistoryPos >= 0 && undoHistoryPos < undoHistory.size() - 1)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 undoHistoryPos++;
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	483 delete tl;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	484 tl = new TimelineObject(undoHistory.at(undoHistoryPos));
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 changed = true;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 updateMenuStates();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 update();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 void DemoEditor::performUndo()
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 if (undoHistoryPos > 0 && undoHistory.size() > 1)
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496 {
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 undoHistoryPos--;
378 feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	498 delete tl;
feaeec4c6c55 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 376 diff changeset	499 tl = new TimelineObject(undoHistory.at(undoHistoryPos));
376 40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 changed = true;
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 updateMenuStates();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 update();
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 }
40e33ad0d153 Work towards a working editor .. some day. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505 }

Mercurial > hg > dmlib

annotate edmain.cpp @ 391:28a74940f2b6