diff --git a/ChangeLog b/ChangeLog index 939f981921..611fbcbc68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,34 @@ -2005-10-28 Tobias Doerffel +2005-10-31 Tobias Doerffel + + * include/midi_alsa_seq.h: + * src/midi/midi_alsa_seq.cpp: + several bug-fixes + +2005-10-30 Tobias Doerffel + + * include/midi_alsa_seq.h: + * src/midi/midi_alsa_seq.cpp: + added first version of ALSA-sequencer - currently doesn't handle all + common events, but note-on/off and key-pressure work so far + + * include/midi_client.h: + - added method applyPortMode() for making MIDI-subsystem able to get + known of port-mode changes which is neccessary if they have REAL + ports like ALSA-seq. has + - renamed validatePortName() to applyPortName() and made it non-pure + virtual + + * src/tracks/channel_track.cpp: + initialize m_midiEventRoutingEnabled with FALSE per default in ctor + + * src/core/mixer.cpp: + delete midi-dev on exit + + * src/midi/midi_midi_alsa_raw.cpp: + when reading/saving device-name via config-mgr, use "midialsaraw" + instead of "midialsa" as context-name + +2005-10-28 Tobias Doerffel * src/widgets/project_notes.cpp: set initial text to bright gray, since black text on a very dark back- @@ -18,7 +48,7 @@ reorder some code in constructor for not crashing if window is shown while constructor is still running -2005-10-23 Tobias Doerffel +2005-10-23 Tobias Doerffel * src/widgets/led_checkbox.cpp: also emit toggled()-signal if state actually wasn't changed @@ -55,7 +85,7 @@ * src/midi/midi_device.cpp: removed -2005-10-21 Tobias Doerffel +2005-10-21 Tobias Doerffel * src/widgets/tempo_sync_knob.cpp: do not implement the same code as knob does in mouseMoveEvent() - call @@ -65,7 +95,7 @@ * src/widgets/knob.cpp: cleaned up a lot and fixed some bugs -2005-10-20 Tobias Doerffel +2005-10-20 Tobias Doerffel * include/song_editor.h: decreased MAX_BPM to 999 since BPM-LCD-spinbox is intended to have @@ -80,7 +110,7 @@ * configure.in: check for libfst and present VST-SDK header-files -2005-10-19 Tobias Doerffel +2005-10-19 Tobias Doerffel * plugins/vestige/vestige.h: * plugins/vestige/vestige.cpp: @@ -120,7 +150,7 @@ * resources/: improved icons such as project_*.png and sample-track-related icons -2005-10-18 Tobias Doerffel +2005-10-18 Tobias Doerffel * include/channel_track.h: * src/tracks/channel_track.cpp: @@ -155,7 +185,7 @@ added setParameter() and getParameter()-methods for making LMMS able to set parameters of a specific plugin without knowing anything about it -2005-10-17 Tobias Doerffel +2005-10-17 Tobias Doerffel * buildtools/bin2res.cpp: * include/embed.h: @@ -175,7 +205,7 @@ removed Moog-2-filter as it is only very CPU-intensive without any significant difference to sound of normal Moog-filter -2005-10-16 Tobias Doerffel +2005-10-16 Tobias Doerffel * src/lib/ladspa_manager.cpp: skip not existing/unreadable directories when searching for plugins @@ -214,14 +244,14 @@ * src/core/instrument.cpp: renamed files soundgenerator.* to instrument.* as well as class-name -2005-10-15 Tobias Doerffel +2005-10-15 Tobias Doerffel * include/vestige.h: * src/soundgenerators/vestige.cpp: new plugin "VeSTige" for handling VST-plugins - VERY experimental, but at least, we get some sound out of these strange dll-files ;-) -2005-10-13 Tobias Doerffel +2005-10-13 Tobias Doerffel * src/audio/audio_jack.cpp: do not fill up buffers if JACK-transport is not rolling but at the same @@ -289,20 +319,20 @@ added tempo-sync-knob which automatically converts fixed note-length's to a fixed time in ms everytime BPM is changed -2005-10-03 Tobias Doerffel +2005-10-03 Tobias Doerffel * include/basic_filters.h: - added another moog-filter which sounds a bit better but needs MUCH more CPU-time... - cleaned up different filter-code-branches -2005-10-02 Tobias Doerffel +2005-10-02 Tobias Doerffel * include/oscillator.h: cast to int instead of floor()ing value in oscillator::phase() which makes the whole thing faster again... -2005-09-29 Tobias Doerffel +2005-09-29 Tobias Doerffel * src/widgets/tab_widget.cpp: fixed bugs when adding widget with already existing index @@ -341,7 +371,7 @@ * inlude/empty_sg_plugin.h: added empty sound-generator plugin -2005-09-28 Tobias Doerffel +2005-09-28 Tobias Doerffel * include/song_editor.h: * src/core/song_editor.cpp: @@ -374,7 +404,7 @@ - different painting if no caption was defined - switch tabs if wheel-events occurs -2005-09-27 Tobias Doerffel +2005-09-27 Tobias Doerffel * src/tracks/channel_track.cpp: began improving GUI of channel-track-window @@ -389,12 +419,12 @@ define macro ALSA_PCM_NEW_HW_PARAMS_API for working with older ALSA- versions which offer old and new HW-param-API - we're using the new one -2005-09-26 Tobias Doerffel +2005-09-26 Tobias Doerffel * many files: make LMMS compile with Qt 3.0 and GCC 2.95 -2005-09-25 Tobias Doerffel +2005-09-25 Tobias Doerffel * src/audio/audio_jack.cpp: - decreased wait-time from 0.5 ms to 0.2 ms in writeBufferToDev(...) @@ -416,7 +446,7 @@ do not save play-pos from previous play-mode when beginning to play in different play-mode - fixes bug in timeline behaviour "back to start" -2005-09-24 Tobias Doerffel +2005-09-24 Tobias Doerffel * configure.in: * include/audio_oss.h: @@ -445,12 +475,12 @@ * src/core/track_container.cpp: set modified-state for song when removing track -2005-09-21 Tobias Doerffel +2005-09-21 Tobias Doerffel * configure.in: made 0.1.1 release -2005-09-20 Tobias Doerffel +2005-09-20 Tobias Doerffel * include/about_dialog.h: * src/core/about_dialog.cpp: @@ -485,12 +515,12 @@ up everything - fixes bug with empty browsers after fresh personal installation of LMMS -2005-09-19 Tobias Doerffel +2005-09-19 Tobias Doerffel * configure.in: made 0.1.0 release -2005-09-18 Tobias Doerffel +2005-09-18 Tobias Doerffel * src/tracks/bb_track.cpp: revised paintEvent()-method -> bb-TCO's are now painted with a gradient! @@ -545,7 +575,7 @@ for determining path to localization files - this call created all wizard-widgets before actual localization was loaded... -2005-09-17 Tobias Doerffel +2005-09-17 Tobias Doerffel * src/core/setup_dialog.cpp: added switches for disabling tooltips and turning on classical knob- @@ -555,7 +585,7 @@ * src/widget/led_checkbox.cpp: added LED-check-box -2005-09-16 Tobias Doerffel +2005-09-16 Tobias Doerffel * src/core/mixer.cpp: clear output-buffers in ctor before using them -> avoids awful noises @@ -592,7 +622,7 @@ usage of tooltips, so there's no difference to code using tooltips whether it is compiled with Qt 3 or Qt 4 -2005-09-14 Tobias Doerffel +2005-09-14 Tobias Doerffel * include/mixer.h: * include/note_play_handle.h: @@ -641,7 +671,7 @@ * locale/fr.ts: added French translation -2005-09-13 Tobias Doerffel +2005-09-13 Tobias Doerffel * src/core/lmms_main_win.cpp: - show setup-dialog if LMMS is started first time or mixer uses dummy- @@ -676,7 +706,7 @@ added probeDevice()-method which eases determining device-name in either actual audio-class as well as in it's setup-widget -2005-09-11 Tobias Doerffel +2005-09-11 Tobias Doerffel * src/core/mixer.cpp: use new audio-settings-technology for opening audio-device @@ -721,7 +751,7 @@ * src/lib/embed.cpp: do not return null-pixmap if pixmap not found -2005-09-10 Tobias Doerffel +2005-09-10 Tobias Doerffel * resources/setup_audio.png: * resources/setup_general.png: @@ -759,7 +789,7 @@ * resources/ir.ts: added Persian translation -2005-09-04 Tobias Doerffel +2005-09-04 Tobias Doerffel * src/audio/audio_oss.cpp: - read device-name from config-file before evaluating environment- @@ -808,7 +838,7 @@ * resources/es.ts: added Spanish translation -2005-09-02 Tobias Doerffel +2005-09-02 Tobias Doerffel * most files: finished changes began on 2005-08-29 @@ -821,7 +851,7 @@ * resources/de.ts: completed German translation -2005-08-29 Tobias Doerffel +2005-08-29 Tobias Doerffel * most files: begin to use new bufferAllocator instead of old buffer-types and @@ -833,7 +863,7 @@ as the constant FRAMES_PER_AUDIO_BUFFER - use mixer::inst()->framesPerAudioBuffer() instead -2005-08-28 Tobias Doerffel +2005-08-28 Tobias Doerffel * include/song_editor.h: * src/core/song_editor.cpp: @@ -866,7 +896,7 @@ * src/core/arp_and_chords_tab_widget.cpp: set m_arpDirection correct when loading older settings -2005-08-27 Tobias Doerffel +2005-08-27 Tobias Doerffel * include/channel_track.h: * src/tracks/channel_track.cpp: @@ -887,7 +917,7 @@ of LMMS and JACK are different - also free buffers in destructor and not just throw them out of list -2005-08-26 Tobias Doerffel +2005-08-26 Tobias Doerffel * include/audio_jack.h: * src/audio/audio_jack.cpp: @@ -900,7 +930,7 @@ * src/lib/buffer_allocator.cpp: added bufferAllocator which is an optimized internal memory-manager -2005-08-24 Tobias Doerffel +2005-08-24 Tobias Doerffel * include/audio_jack.h: * src/audio/audio_jack.cpp: @@ -913,7 +943,7 @@ completed usage of switchable groupboxes by saving groupbox-states and evaluating them in processNote() -2005-08-22 Tobias Doerffel +2005-08-22 Tobias Doerffel * resources/afp_artwork.png: small improvements for better usability and internationalization @@ -977,7 +1007,7 @@ text -2005-08-21 Tobias Doerffel +2005-08-21 Tobias Doerffel * src/widgets/side_bar_widget.cpp: * src/tracks/channel_track.cpp: @@ -1025,14 +1055,14 @@ * src/core/main.cpp: added --version command-line-switch -2005-08-20 Tobias Doerffel +2005-08-20 Tobias Doerffel * src/core/lmms_main_win.cpp: - extended filter for sample-browser - added home- and root-browser for being able to load songs, presets, samples etc. from somewhere else than within lmms-working-directory -2005-07-27 Tobias Doerffel +2005-07-27 Tobias Doerffel * src/core/lmms_main_win.cpp: * src/core/track_container.cpp: @@ -1071,7 +1101,7 @@ added MIDIDEV-environment variable for being able to choose a MIDI device different from the default one -2005-07-24 Tobias Doerffel +2005-07-24 Tobias Doerffel * include/midi_mapper.h: * src/midi/midi_mapper.cpp: @@ -1102,7 +1132,7 @@ * resources/ru.ts: added Russian translation -2005-07-23 Tobias Doerffel +2005-07-23 Tobias Doerffel * src/core/piano_roll.cpp: scroll back when stopping and play-position changes to invisible area @@ -1116,7 +1146,7 @@ * src/midi/midi_device.cpp: limit volume between 0 and 127 when sending out note-on-event -2005-07-21 Tobias Doerffel +2005-07-21 Tobias Doerffel * include/nstate_button.h: * src/widgets/nstate_button.cpp: @@ -1135,7 +1165,7 @@ * lmms-0.1.0rc1.tar.bz2: release of Release Candidate 1 of LMMS 0.1.0 -2005-07-20 Tobias Doerffel +2005-07-20 Tobias Doerffel * src/midi/midi_file.cpp: - proper handling of note-on-events which velocity 0 -> treat like @@ -1156,14 +1186,14 @@ * src/widgets/knob.cpp: fixed bugs caused by changes made before for scroll-wheel-support -2005-07-19 Tobias Doerffel +2005-07-19 Tobias Doerffel * include/knob.h: * src/widgets/knob.cpp: added better scroll-wheel support which increases/decreases knob-value by 20th of range (e.g 0.05 if knob is ranged between 0 and 1) -2005-07-17 Tobias Doerffel +2005-07-17 Tobias Doerffel * projects/: added "covers"-dir and added "Preludium and Fuge A-Minor" by J.S.Bach @@ -1202,12 +1232,12 @@ added missing arg()-call to QMessageBox::critical()-call in audioFileDevice-ctor -2005-07-16 Tobias Doerffel +2005-07-16 Tobias Doerffel * src/core/config_mgr.cpp: added shortcuts to navigation-buttons -2005-07-14 Tobias Doerffel +2005-07-14 Tobias Doerffel * src/core/piano_roll.cpp: only play notes while editing if we're not in play-mode @@ -1217,7 +1247,7 @@ when exporting always render one additional tact at the end so that we don't cut off notes with delay etc. -2005-07-12 Tobias Doerffel +2005-07-12 Tobias Doerffel - successful compilation with GCC 4.0.1 ;-) @@ -1225,7 +1255,7 @@ fixed bug responsible for playing base-notes of chords all time if any arpeggio selected was selected -2005-07-11 Tobias Doerffel +2005-07-11 Tobias Doerffel * resources/source/wizard_files.xcf: * resources/wizard_files.png: @@ -1244,7 +1274,7 @@ * lmms-0.1.0beta.tar.bz2: made beta-release of 0.1.0 and announced it on kde-apps.org -2005-07-10 Tobias Doerffel +2005-07-10 Tobias Doerffel * presets/TripleOscillator/: added cool Church Organ preset and improved Xylophon preset @@ -1279,7 +1309,7 @@ * src/core/export_project_dialog.cpp: renamed from export_song_dialog.ext to export_project_dialog.ext -2005-07-09 Tobias Doerffel +2005-07-09 Tobias Doerffel * all files: now all source-code-files but some single exceptions do not have more @@ -1330,7 +1360,7 @@ which makes it all a bit smaller and faster since we do not always have to access the current element using the []-operator -2005-07-08 Tobias Doerffel +2005-07-08 Tobias Doerffel * src/core/envelope_tab_widget.cpp: * src/lib/sample_buffer.cpp: @@ -1341,7 +1371,7 @@ * projects/: added directories "tutorials" and "recorded_loops" -2005-07-07 Tobias Doerffel +2005-07-07 Tobias Doerffel * include/bb_track.h: added FASTCALL to moveLocation(...) and changeLength(...) which fixes @@ -1353,7 +1383,7 @@ * samples/: added a lot of new samples from wikisource and others -2005-07-06 Tobias Doerffel +2005-07-06 Tobias Doerffel * include/project_notes.h: * src/core/song_editor.cpp: @@ -1385,7 +1415,7 @@ added setKey()- and key()-member which setting/getting absolute key of note -2005-07-05 Tobias Doerffel +2005-07-05 Tobias Doerffel * configure.in: * projects/: @@ -1415,7 +1445,7 @@ check whether compiler knows floorf and powf and if not, define them to floor/pow -2005-07-04 Tobias Doerffel +2005-07-04 Tobias Doerffel * most files: made LMMS compiling (and working) with Qt 3.0, GCC 2.95 and other old @@ -1430,7 +1460,7 @@ added support for versions of libsndfile < 1.0.11 since API has changed in libsndfile 1.0.11 -2005-07-03 Tobias Doerffel +2005-07-03 Tobias Doerffel * resources/control_env_amount_active.png: * resources/control_env_amount_inactive.png: @@ -1468,7 +1498,7 @@ * src/audio/audio_alsa.cpp: added support for 48 KHz soundcards -2005-07-02 Tobias Doerffel +2005-07-02 Tobias Doerffel * configure.in: * src/lib/sample_buffer.cpp: @@ -1494,7 +1524,7 @@ led to crash when having piano-roll open while deleting pattern (e.g. creating new file, opening file etc.) -2005-07-01 Tobias Doerffel +2005-07-01 Tobias Doerffel * all files: replaced "location" in names of functions/variables by "position" @@ -1507,7 +1537,7 @@ added support for autoscroll in piano-roll when playing/recording pattern -2005-06-30 Tobias Doerffel +2005-06-30 Tobias Doerffel * include/channel_track.h: * include/midi_device.h @@ -1546,7 +1576,7 @@ added missing #include "debug.h" for solving problems with undeclared assert() because of not included assert.h -2005-06-29 Tobias Doerffel +2005-06-29 Tobias Doerffel * configure.in: * include/audio_sdl.h: @@ -1557,13 +1587,13 @@ * README: updated everything a bit... -2005-06-28 Tobias Doerffel +2005-06-28 Tobias Doerffel * include/envelope_tab_widget.h: * src/core/envelope_tab_widget.cpp: use button instead of knob for turning filter on/off -2005-06-27 Tobias Doerffel +2005-06-27 Tobias Doerffel * samples/effects/Makefile.am: don't install effect-samples into directory of basses-samples diff --git a/Makefile.am b/Makefile.am index e6385cfcc4..41043297c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,6 +62,7 @@ lmms_MOC = \ ./mixer.moc \ ./name_label.moc \ ./nstate_button.moc \ + ./midi_alsa_seq.moc \ ./midi_tab_widget.moc \ ./pattern.moc \ ./piano_roll.moc \ @@ -144,6 +145,7 @@ lmms_SOURCES = \ $(srcdir)/src/lib/sample_buffer.cpp \ $(srcdir)/src/lib/string_pair_drag.cpp \ $(srcdir)/src/midi/midi_alsa_raw.cpp \ + $(srcdir)/src/midi/midi_alsa_seq.cpp \ $(srcdir)/src/midi/midi_client.cpp \ $(srcdir)/src/midi/midi_file.cpp \ $(srcdir)/src/midi/midi_mapper.cpp \ @@ -266,7 +268,8 @@ lmms_SOURCES = \ $(srcdir)/include/instrument_play_handle.h \ $(srcdir)/include/string_pair_drag.h \ $(srcdir)/include/ladspa_manager.h \ - $(srcdir)/include/midi_tab_widget.h + $(srcdir)/include/midi_tab_widget.h \ + $(srcdir)/include/midi_alsa_seq.h EXTRA_DIST = $(lmms_EMBEDDED_RESOURCES) diff --git a/buildtools/bin2res.cpp b/buildtools/bin2res.cpp index 4570096d9c..1d0737f407 100644 --- a/buildtools/bin2res.cpp +++ b/buildtools/bin2res.cpp @@ -1,7 +1,7 @@ /* * bin2res.cpp - generate embedded resources from binary data (based on qembed) * - * Copyright (c) 2005 Tobias Doerffel + * Copyright (c) 2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/configure.in b/configure.in index fb5a76d4cc..9f45799831 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.1.1-cvs20051027, tobydox@users.sourceforge.net) -AM_INIT_AUTOMAKE(lmms, 0.1.1-cvs20051027) +AC_INIT(lmms, 0.1.1-cvs20051106, tobydox/at/users.sourceforge.net) +AM_INIT_AUTOMAKE(lmms, 0.1.1-cvs20051106) AM_CONFIG_HEADER(config.h) diff --git a/include/about_dialog.h b/include/about_dialog.h index f5c35ccd9d..ccef478ef1 100644 --- a/include/about_dialog.h +++ b/include/about_dialog.h @@ -2,7 +2,7 @@ * about_dialog.h - declaration of class aboutDialog * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/arp_and_chords_tab_widget.h b/include/arp_and_chords_tab_widget.h index fa58cf58c9..59daba0e48 100644 --- a/include/arp_and_chords_tab_widget.h +++ b/include/arp_and_chords_tab_widget.h @@ -3,7 +3,7 @@ * provides code for using arpeggio and chords * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_alsa.h b/include/audio_alsa.h index aa4cdf8086..949a9b1ac6 100644 --- a/include/audio_alsa.h +++ b/include/audio_alsa.h @@ -2,7 +2,7 @@ * audio_alsa.h - device-class that implements ALSA-PCM-output * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_device.h b/include/audio_device.h index 0bf7dd9802..96d945c8e8 100644 --- a/include/audio_device.h +++ b/include/audio_device.h @@ -2,7 +2,7 @@ * audio_device.h - base-class for audio-devices, used by LMMS-mixer * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_dummy.h b/include/audio_dummy.h index 0b7ff86f59..97d4033fb5 100644 --- a/include/audio_dummy.h +++ b/include/audio_dummy.h @@ -2,7 +2,7 @@ * audio_dummy.h - dummy-audio-device * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_file_device.h b/include/audio_file_device.h index a958322509..065d4e6854 100644 --- a/include/audio_file_device.h +++ b/include/audio_file_device.h @@ -3,7 +3,7 @@ * their output into a file * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_file_ogg.h b/include/audio_file_ogg.h index 9ab2349325..1c409377c2 100644 --- a/include/audio_file_ogg.h +++ b/include/audio_file_ogg.h @@ -3,7 +3,7 @@ * into an OGG-file. This is used for song-export. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_file_wave.h b/include/audio_file_wave.h index 61358a0e97..a2f8fb422c 100644 --- a/include/audio_file_wave.h +++ b/include/audio_file_wave.h @@ -3,7 +3,7 @@ * into an WAVE-file. This is used for song-export. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_jack.h b/include/audio_jack.h index 4b33b79eb0..31f738d512 100644 --- a/include/audio_jack.h +++ b/include/audio_jack.h @@ -2,7 +2,7 @@ * audio_jack.h - support for JACK-transport * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_oss.h b/include/audio_oss.h index 443a2bcd48..8d7666a5cf 100644 --- a/include/audio_oss.h +++ b/include/audio_oss.h @@ -2,7 +2,7 @@ * audio_oss.h - device-class that implements OSS-PCM-output * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_sample_recorder.h b/include/audio_sample_recorder.h index 31a2af9cc2..40a08c566b 100644 --- a/include/audio_sample_recorder.h +++ b/include/audio_sample_recorder.h @@ -4,7 +4,7 @@ * also harddisk * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/audio_sdl.h b/include/audio_sdl.h index 6c6cf890a3..ec7b7956dc 100644 --- a/include/audio_sdl.h +++ b/include/audio_sdl.h @@ -2,7 +2,7 @@ * audio_sdl.h - device-class that performs PCM-output via SDL * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/basic_filters.h b/include/basic_filters.h index 7d02c0efd7..d0ea55603b 100644 --- a/include/basic_filters.h +++ b/include/basic_filters.h @@ -5,7 +5,7 @@ * modified and enhanced by Tobias Doerffel, 2004 * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/bb_editor.h b/include/bb_editor.h index f3d4b46b8b..266481ca15 100644 --- a/include/bb_editor.h +++ b/include/bb_editor.h @@ -2,7 +2,7 @@ * bb_editor.h - declaration of class bbEditor, a basic-component of LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/bb_track.h b/include/bb_track.h index b0436ca5ac..3380525b9c 100644 --- a/include/bb_track.h +++ b/include/bb_track.h @@ -3,7 +3,7 @@ * (which is a singleton-class) as track * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/buffer_allocator.h b/include/buffer_allocator.h index 24f84c1699..f024495035 100644 --- a/include/buffer_allocator.h +++ b/include/buffer_allocator.h @@ -3,7 +3,7 @@ * optimized memory-management for audio-buffers * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/clipboard.h b/include/clipboard.h index 01f269b5ce..0eb443642a 100644 --- a/include/clipboard.h +++ b/include/clipboard.h @@ -2,7 +2,7 @@ * clipboard.h - the clipboard for patterns, notes etc. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/config_mgr.h b/include/config_mgr.h index 89afa14444..feb577b465 100644 --- a/include/config_mgr.h +++ b/include/config_mgr.h @@ -2,7 +2,7 @@ * config_mgr.h - class configManager, a class for managing LMMS-configuration * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/debug.h b/include/debug.h index 0e3c3559e7..413b026b16 100644 --- a/include/debug.h +++ b/include/debug.h @@ -2,7 +2,7 @@ * debug.h - header file to be included for debugging purposes * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/dummy_instrument.h b/include/dummy_instrument.h index c8af94104f..7896b3bc0c 100644 --- a/include/dummy_instrument.h +++ b/include/dummy_instrument.h @@ -3,7 +3,7 @@ * be loaded * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/dummy_plugin.h b/include/dummy_plugin.h index f84e44af47..16b46693d8 100644 --- a/include/dummy_plugin.h +++ b/include/dummy_plugin.h @@ -3,7 +3,7 @@ * found * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/effect_board.h b/include/effect_board.h index d78dfb12d1..c386cd0ab4 100644 --- a/include/effect_board.h +++ b/include/effect_board.h @@ -2,7 +2,7 @@ * effect_board.h - stuff for effect-board * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/embed.h b/include/embed.h index 1fb6878d7a..c0510ce527 100644 --- a/include/embed.h +++ b/include/embed.h @@ -2,7 +2,7 @@ * embed.h - misc. stuff for using embedded data (resources linked into binary) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/endian_handling.h b/include/endian_handling.h index 8254e9db49..0a9a539fbf 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -2,7 +2,7 @@ * endian.h - handle endianess-problems * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/envelope_and_lfo_widget.h b/include/envelope_and_lfo_widget.h index e1488760f6..89e69cc39e 100644 --- a/include/envelope_and_lfo_widget.h +++ b/include/envelope_and_lfo_widget.h @@ -4,7 +4,7 @@ * channel-window * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/envelope_tab_widget.h b/include/envelope_tab_widget.h index 59d778ec1d..edafefd2a1 100644 --- a/include/envelope_tab_widget.h +++ b/include/envelope_tab_widget.h @@ -4,7 +4,7 @@ * and a filter * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/export.h b/include/export.h index dc98310134..2911654d42 100644 --- a/include/export.h +++ b/include/export.h @@ -2,7 +2,7 @@ * export.h - header which is needed for song-export * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/export_project_dialog.h b/include/export_project_dialog.h index 0789b5a943..bf420a81da 100644 --- a/include/export_project_dialog.h +++ b/include/export_project_dialog.h @@ -3,7 +3,7 @@ * responsible for exporting project * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/file_browser.h b/include/file_browser.h index e9ba58b2fe..115da08283 100644 --- a/include/file_browser.h +++ b/include/file_browser.h @@ -2,7 +2,7 @@ * file_browser.h - include file for fileBrowser * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/group_box.h b/include/group_box.h index 565701a2af..c05e9c4043 100644 --- a/include/group_box.h +++ b/include/group_box.h @@ -2,7 +2,7 @@ * group_box.h - LMMS-groupbox * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/gui_templates.h b/include/gui_templates.h index 59032386e9..c7fdc1122d 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -2,7 +2,7 @@ * gui_templates.h - GUI-specific templates * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/instrument.h b/include/instrument.h index 6cbc4b3e19..38cbc4727d 100644 --- a/include/instrument.h +++ b/include/instrument.h @@ -3,7 +3,7 @@ * standard interface for all instrument plugins * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/instrument_play_handle.h b/include/instrument_play_handle.h index bfdf51dd00..b694f62833 100644 --- a/include/instrument_play_handle.h +++ b/include/instrument_play_handle.h @@ -2,7 +2,7 @@ * instrument_play_handle.h - play-handle for playing an instrument * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/interpolation.h b/include/interpolation.h index dfce10a0ad..012260ea9f 100644 --- a/include/interpolation.h +++ b/include/interpolation.h @@ -2,7 +2,7 @@ * interpolation.h - fast implementations of several interpolation-algorithms * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/knob.h b/include/knob.h index 9d333efd2f..15271933bd 100644 --- a/include/knob.h +++ b/include/knob.h @@ -5,7 +5,7 @@ * Josef Wilgen * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/lcd_spinbox.h b/include/lcd_spinbox.h index ac8f330ac8..fda06089ff 100644 --- a/include/lcd_spinbox.h +++ b/include/lcd_spinbox.h @@ -2,7 +2,7 @@ * lcd_spinbox.h - class lcdSpinBox, an improved QLCDNumber * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/led_checkbox.h b/include/led_checkbox.h index dba066b29b..90fed3fc79 100644 --- a/include/led_checkbox.h +++ b/include/led_checkbox.h @@ -2,7 +2,7 @@ * led_checkbox.h - class ledCheckBox, an improved QCheckBox * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi.h b/include/midi.h index a5dd6b3bb4..844dfdd31b 100644 --- a/include/midi.h +++ b/include/midi.h @@ -2,7 +2,7 @@ * midi.h - constants, structs etc. concerning MIDI * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_alsa_raw.h b/include/midi_alsa_raw.h index 2196af779d..7d3a24490e 100644 --- a/include/midi_alsa_raw.h +++ b/include/midi_alsa_raw.h @@ -2,7 +2,7 @@ * midi_alsa_raw.h - midi-client for RawMIDI via ALSA * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_client.h b/include/midi_client.h index 3a28d87de2..4d564c9147 100644 --- a/include/midi_client.h +++ b/include/midi_client.h @@ -2,7 +2,7 @@ * midi_client.h - base-class for MIDI-clients like ALSA-sequencer-client * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -53,18 +53,25 @@ public: midiClient( void ); virtual ~midiClient(); - virtual midiPort * FASTCALL createPort( midiEventProcessor * _mep, - const QString & _desired_name ) = 0; - + // to be implemented by sub-classes virtual void FASTCALL processOutEvent( const midiEvent & _me, const midiTime & _time, const midiPort * _port ) = 0; - // validate port-name by trying to change port name in underlying MIDI- - // subsystem - virtual void FASTCALL validatePortName( midiPort * _port ) = 0; + // inheriting classes can re-implement this for being able to update + // their internal port-structures etc. + virtual void FASTCALL applyPortMode( midiPort * _port ); + virtual void FASTCALL applyPortName( midiPort * _port ); - void FASTCALL removePort( midiPort * _port ); + // inheriting classes can re-implement this although it's actually not + // neccessary, because they can catch port-mode-changes and do their + // stuff as soon as port-mode changes from DUMMY to something else + // re-implemented methods HAVE to call addPort() of base-class!! + virtual midiPort * FASTCALL addPort( midiEventProcessor * _mep, + const QString & _name ); + + // re-implemented methods HAVE to call removePort() of base-class!! + virtual void FASTCALL removePort( midiPort * _port ); static midiClient * openMidiClient( void ); @@ -88,12 +95,6 @@ public: protected: - inline void addPort( midiPort * _port ) - { - m_midiPorts.push_back( _port ); - } - - vvector m_midiPorts; } ; @@ -112,11 +113,6 @@ public: protected: - virtual midiPort * FASTCALL createPort( midiEventProcessor * _mep, - const QString & _desired_name ); - - virtual void FASTCALL validatePortName( midiPort * _port ); - void FASTCALL parseData( const Uint8 _c ); virtual void FASTCALL sendByte( const Uint8 _c ) = 0; @@ -124,7 +120,7 @@ protected: private: void processParsedEvent(); - void FASTCALL processOutEvent( const midiEvent & _me, + virtual void FASTCALL processOutEvent( const midiEvent & _me, const midiTime & _time, const midiPort * _port ); @@ -148,6 +144,6 @@ private: } m_midiParseData; } ; - - +*/ #endif + diff --git a/include/midi_dummy.h b/include/midi_dummy.h index 657882f093..1de43be1da 100644 --- a/include/midi_dummy.h +++ b/include/midi_dummy.h @@ -2,7 +2,7 @@ * midi_dummy.h - dummy MIDI-driver * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_event_processor.h b/include/midi_event_processor.h index da4a72ea5a..a0d93d231d 100644 --- a/include/midi_event_processor.h +++ b/include/midi_event_processor.h @@ -2,7 +2,7 @@ * midi_event_processor.h - base-class for midi-processing classes * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_mapper.h b/include/midi_mapper.h index 1696adfddc..5608c9163e 100644 --- a/include/midi_mapper.h +++ b/include/midi_mapper.h @@ -2,7 +2,7 @@ * midi_mapper.h - MIDI-mapper for any midiDevice * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_oss.h b/include/midi_oss.h index 294f5715c1..9d30470847 100644 --- a/include/midi_oss.h +++ b/include/midi_oss.h @@ -2,7 +2,7 @@ * midi_oss.h - OSS-raw-midi-client * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_port.h b/include/midi_port.h index b5ee661650..4ed6825912 100644 --- a/include/midi_port.h +++ b/include/midi_port.h @@ -3,7 +3,7 @@ * sequencing system * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -73,22 +73,14 @@ public: return( m_name ); } - inline void setName( const QString & _name ) - { - m_name = _name; - } - - void FASTCALL trySetName( const QString & _name ); + void FASTCALL setName( const QString & _name ); inline modes mode( void ) const { return( m_mode ); } - inline void setMode( modes _mode ) - { - m_mode = _mode; - } + void setMode( modes _mode ); inline Sint8 inputChannel( void ) const { diff --git a/include/midi_tab_widget.h b/include/midi_tab_widget.h index b40be5f5ab..99ede0f171 100644 --- a/include/midi_tab_widget.h +++ b/include/midi_tab_widget.h @@ -3,7 +3,7 @@ * MIDI-related stuff * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/midi_time.h b/include/midi_time.h index 5fbbd9035e..2ea8d5a42a 100644 --- a/include/midi_time.h +++ b/include/midi_time.h @@ -3,7 +3,7 @@ * position- and length-variables * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/mixer.h b/include/mixer.h index 6333483a2c..8eb2105482 100644 --- a/include/mixer.h +++ b/include/mixer.h @@ -2,7 +2,7 @@ * mixer.h - audio-device-independent mixer for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/mmp.h b/include/mmp.h index 5490a8ab5a..fcd23979c2 100644 --- a/include/mmp.h +++ b/include/mmp.h @@ -2,7 +2,7 @@ * mmp.h - class for reading and writing multimedia-project-files * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/name_label.h b/include/name_label.h index c396e76110..042728a47d 100644 --- a/include/name_label.h +++ b/include/name_label.h @@ -3,7 +3,7 @@ * double-clicking it * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/note.h b/include/note.h index f3293988e3..1e6bfdf468 100644 --- a/include/note.h +++ b/include/note.h @@ -3,7 +3,7 @@ * note + definitions of several constants and enums * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/note_play_handle.h b/include/note_play_handle.h index 3bd5e0ccbc..6c4c060306 100644 --- a/include/note_play_handle.h +++ b/include/note_play_handle.h @@ -3,7 +3,7 @@ * by LMMS-Play-Engine * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/nstate_button.h b/include/nstate_button.h index 68cd7bd3b9..295ab9df35 100644 --- a/include/nstate_button.h +++ b/include/nstate_button.h @@ -2,7 +2,7 @@ * nstate_button.h - declaration of class nStateButton * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/oscillator.h b/include/oscillator.h index 1737bb281d..612bf6b0ed 100644 --- a/include/oscillator.h +++ b/include/oscillator.h @@ -2,7 +2,7 @@ * oscillator.h - header-file for oscillator.cpp, a powerful oscillator-class * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/panning.h b/include/panning.h index 6fdd7b1214..aa18a7595e 100644 --- a/include/panning.h +++ b/include/panning.h @@ -3,7 +3,7 @@ * panning of a note * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/pattern.h b/include/pattern.h index 15851671e1..022f453e98 100644 --- a/include/pattern.h +++ b/include/pattern.h @@ -3,7 +3,7 @@ * about a pattern * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/piano_roll.h b/include/piano_roll.h index 1f48b478ba..94fe41c99d 100644 --- a/include/piano_roll.h +++ b/include/piano_roll.h @@ -3,7 +3,7 @@ * can set and edit notes in an easy way * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/piano_widget.h b/include/piano_widget.h index 933fa52f5e..700f7e7298 100644 --- a/include/piano_widget.h +++ b/include/piano_widget.h @@ -3,7 +3,7 @@ * an interactive piano/keyboard-widget * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/pixmap_button.h b/include/pixmap_button.h index 6376b780c6..10bce4398f 100644 --- a/include/pixmap_button.h +++ b/include/pixmap_button.h @@ -2,7 +2,7 @@ * pixmap_button.h - declaration of class pixmapButton * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/play_handle.h b/include/play_handle.h index cc96636bfa..ba8b6ed3c1 100644 --- a/include/play_handle.h +++ b/include/play_handle.h @@ -3,7 +3,7 @@ * LMMS-Play-Engine * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/plugin.h b/include/plugin.h index 95daa74d07..116e7392d5 100644 --- a/include/plugin.h +++ b/include/plugin.h @@ -2,7 +2,7 @@ * plugin.h - class plugin, the base-class and generic interface for all plugins * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/plugin_browser.h b/include/plugin_browser.h index 066c6a834e..fcb3c7be6a 100644 --- a/include/plugin_browser.h +++ b/include/plugin_browser.h @@ -2,7 +2,7 @@ * plugin_browser.h - include file for pluginBrowser * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/preset_preview_play_handle.h b/include/preset_preview_play_handle.h index f263524216..9e7b1b3904 100644 --- a/include/preset_preview_play_handle.h +++ b/include/preset_preview_play_handle.h @@ -3,7 +3,7 @@ * of a preset * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/project_notes.h b/include/project_notes.h index 5c9bdb312b..a6a5e96f14 100644 --- a/include/project_notes.h +++ b/include/project_notes.h @@ -2,7 +2,7 @@ * project_notes.h - header for project-notes-editor * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/qt3support.h b/include/qt3support.h index 1730353fa5..b2567fa9fa 100644 --- a/include/qt3support.h +++ b/include/qt3support.h @@ -2,7 +2,7 @@ * qt3support.h - layer for supporting Qt3 * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/rename_dialog.h b/include/rename_dialog.h index 6e5860f8b5..25d3705dbb 100644 --- a/include/rename_dialog.h +++ b/include/rename_dialog.h @@ -3,7 +3,7 @@ * changing the content of a string * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/sample_buffer.h b/include/sample_buffer.h index f3bd38ea30..d2a0818387 100644 --- a/include/sample_buffer.h +++ b/include/sample_buffer.h @@ -2,7 +2,7 @@ * sample_buffer.h - container-class sampleBuffer * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/sample_play_handle.h b/include/sample_play_handle.h index 2df0c434f7..054817aec5 100644 --- a/include/sample_play_handle.h +++ b/include/sample_play_handle.h @@ -2,7 +2,7 @@ * sample_play_handle.h - play-handle for playing a sample * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/sample_track.h b/include/sample_track.h index 5953e4e0bd..df516832cb 100644 --- a/include/sample_track.h +++ b/include/sample_track.h @@ -3,7 +3,7 @@ * samples * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/setup_dialog.h b/include/setup_dialog.h index 1fe0b67c9b..0204a9a924 100644 --- a/include/setup_dialog.h +++ b/include/setup_dialog.h @@ -2,7 +2,7 @@ * setup_dialog.h - dialog for setting up LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/side_bar.h b/include/side_bar.h index 0f0f427995..c62f5539ac 100644 --- a/include/side_bar.h +++ b/include/side_bar.h @@ -2,7 +2,7 @@ * side_bar.h - code for side-bar in LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/side_bar_widget.h b/include/side_bar_widget.h index ba059790c5..f286a064ad 100644 --- a/include/side_bar_widget.h +++ b/include/side_bar_widget.h @@ -2,7 +2,7 @@ * side_bar_widget.h - base-class for all side-bar-widgets * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/song_editor.h b/include/song_editor.h index a84dc4b672..967c1b31c0 100644 --- a/include/song_editor.h +++ b/include/song_editor.h @@ -3,7 +3,7 @@ * setup your songs * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/spc_bg_hndl_widget.h b/include/spc_bg_hndl_widget.h index 901a3f0fba..014e966523 100644 --- a/include/spc_bg_hndl_widget.h +++ b/include/spc_bg_hndl_widget.h @@ -2,7 +2,7 @@ * spc_bg_hndl_widget.h - class specialBgHandlingWidget * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/string_pair_drag.h b/include/string_pair_drag.h index 41b3df102e..cb72cbd4a9 100644 --- a/include/string_pair_drag.h +++ b/include/string_pair_drag.h @@ -3,7 +3,7 @@ * for drag'n'drop of string-pairs * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/surround_area.h b/include/surround_area.h index 23dd9cdb31..0f152d9682 100644 --- a/include/surround_area.h +++ b/include/surround_area.h @@ -4,7 +4,7 @@ * speaker * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/tab_bar.h b/include/tab_bar.h index e960965003..eecc16c49a 100644 --- a/include/tab_bar.h +++ b/include/tab_bar.h @@ -2,7 +2,7 @@ * tab_bar.h - class tabBar * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/tab_button.h b/include/tab_button.h index abda20ec96..e41403cb7c 100644 --- a/include/tab_button.h +++ b/include/tab_button.h @@ -2,7 +2,7 @@ * tab_button.h - declaration of class tabButton * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/tab_widget.h b/include/tab_widget.h index 32576c3cc7..2224c6b5b2 100644 --- a/include/tab_widget.h +++ b/include/tab_widget.h @@ -2,7 +2,7 @@ * tab_widget.h - LMMS-tabwidget * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/templates.h b/include/templates.h index fb49a8be0d..0b8cfa11cf 100644 --- a/include/templates.h +++ b/include/templates.h @@ -2,7 +2,7 @@ * templates.h - miscellanous templates and algorithms * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/text_float.h b/include/text_float.h index 5263dda5f2..45f6416ff2 100644 --- a/include/text_float.h +++ b/include/text_float.h @@ -2,7 +2,7 @@ * text_float.h - class textFloat, a floating text-label * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/timeline.h b/include/timeline.h index b9d0dd1cf2..8865ea1eb5 100644 --- a/include/timeline.h +++ b/include/timeline.h @@ -2,7 +2,7 @@ * timeline.h - class timeLine, representing a time-line with position marker * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/tooltip.h b/include/tooltip.h index c1c3dba3e9..611b59775c 100644 --- a/include/tooltip.h +++ b/include/tooltip.h @@ -2,7 +2,7 @@ * tooltip.h - namespace toolTip, a tooltip-wrapper for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/track.h b/include/track.h index 1245884ed8..17c66fb58e 100644 --- a/include/track.h +++ b/include/track.h @@ -3,7 +3,7 @@ * track-like objects (beat/bassline, sample-track...) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/track_container.h b/include/track_container.h index 93da8f984d..1375cfaa32 100644 --- a/include/track_container.h +++ b/include/track_container.h @@ -3,7 +3,7 @@ * BB-Editor... * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/types.h b/include/types.h index 796ca2513f..27127cccb3 100644 --- a/include/types.h +++ b/include/types.h @@ -2,7 +2,7 @@ * types.h - typedefs for common types that are used in the whole app * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/visualization_widget.h b/include/visualization_widget.h index 4367e33c52..cdd8f9d310 100644 --- a/include/visualization_widget.h +++ b/include/visualization_widget.h @@ -2,7 +2,7 @@ * visualization_widget.h - widget for visualization of waves * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/include/volume.h b/include/volume.h index 640c349d3c..b6e48f38b4 100644 --- a/include/volume.h +++ b/include/volume.h @@ -3,7 +3,7 @@ * of a note * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/lmms.spec.in b/lmms.spec.in index 36d5b16027..c32b6811c2 100644 --- a/lmms.spec.in +++ b/lmms.spec.in @@ -9,7 +9,7 @@ Summary(de): Leistungsfaehiges Sequenzer-, Synthesizer- und Sample-Studio fuer L License: GPL URL: http://lmms.sourceforge.net/ Group: Applications/Multimedia/Sound -Packager: Tobias Doerffel +Packager: Tobias Doerffel Provides: lmms = %{version}-%{release} %if %_suse BuildRequires: gcc gcc-c++ libstdc++-devel autoconf automake libtool make alsa diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 9dadb22802..8cc99c1aed 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -2,7 +2,7 @@ * audio_file_processor.cpp - instrument for using audio-files * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -71,7 +71,7 @@ plugin::descriptor audiofileprocessor_plugin_descriptor = QT_TRANSLATE_NOOP( "pluginBrowser", "simple sampler with various settings for " "using samples (e.g. drums) in a channel" ), - "Tobias Doerffel ", + "Tobias Doerffel ", 0x0100, plugin::INSTRUMENT, PLUGIN_NAME::findEmbeddedData( "logo.png" ) diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index b236d7f2b0..2ac8dbca96 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -3,7 +3,7 @@ * (instrument-plugin for using audio-files) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/plugins/plucked_string_synth/plucked_string_synth.cpp b/plugins/plucked_string_synth/plucked_string_synth.cpp index 6880f83c7b..758c9b517f 100644 --- a/plugins/plucked_string_synth/plucked_string_synth.cpp +++ b/plugins/plucked_string_synth/plucked_string_synth.cpp @@ -2,7 +2,7 @@ * plucked_string_synth.cpp - instrument which uses the Karplus-Strong-algorithm * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -56,7 +56,7 @@ plugin::descriptor pluckedstringsynth_plugin_descriptor = "PluckedStringSynth", QT_TRANSLATE_NOOP( "pluginBrowser", "cheap synthesis of guitar/harp-like sounds" ), - "Tobias Doerffel ", + "Tobias Doerffel ", 0x0100, plugin::INSTRUMENT, PLUGIN_NAME::findEmbeddedData( "logo.png" ) diff --git a/plugins/plucked_string_synth/plucked_string_synth.h b/plugins/plucked_string_synth/plucked_string_synth.h index b066f89036..ee868dd595 100644 --- a/plugins/plucked_string_synth/plucked_string_synth.h +++ b/plugins/plucked_string_synth/plucked_string_synth.h @@ -3,7 +3,7 @@ * is a synth for plucked string-sounds * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index 2885f00ebb..9b5481fb36 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -2,7 +2,7 @@ * triple_oscillator.cpp - powerful instrument with three oscillators * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -66,7 +66,7 @@ plugin::descriptor tripleoscillator_plugin_descriptor = QT_TRANSLATE_NOOP( "pluginBrowser", "three powerful oscillators you can modulate " "in several ways" ), - "Tobias Doerffel ", + "Tobias Doerffel ", 0x0100, plugin::INSTRUMENT, PLUGIN_NAME::findEmbeddedData( "logo.png" ) diff --git a/plugins/triple_oscillator/triple_oscillator.h b/plugins/triple_oscillator/triple_oscillator.h index cb8b873b04..7935b428c9 100644 --- a/plugins/triple_oscillator/triple_oscillator.h +++ b/plugins/triple_oscillator/triple_oscillator.h @@ -3,7 +3,7 @@ * instrument-plugin with 3 oscillators * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index dab6835775..c13a5ee06a 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -2,7 +2,7 @@ * vestige.cpp - instrument-plugin for hosting VST-plugins * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -70,7 +70,7 @@ plugin::descriptor vestige_plugin_descriptor = QT_TRANSLATE_NOOP( "pluginBrowser", "experimental VST-hoster for using VST-plugins " "within LMMS" ), - "Tobias Doerffel ", + "Tobias Doerffel ", 0x0100, plugin::INSTRUMENT, PLUGIN_NAME::findEmbeddedData( "logo.png" ) diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 60ac56de5e..f0e94a9491 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -2,7 +2,7 @@ * vestige.h - instrument VeSTige for hosting VST-plugins * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_alsa.cpp b/src/audio/audio_alsa.cpp index f5a5f57322..980d27be3a 100644 --- a/src/audio/audio_alsa.cpp +++ b/src/audio/audio_alsa.cpp @@ -2,7 +2,7 @@ * audio_alsa.cpp - device-class that implements ALSA-PCM-output * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_device.cpp b/src/audio/audio_device.cpp index 18ce18ad27..edc5bdf27c 100644 --- a/src/audio/audio_device.cpp +++ b/src/audio/audio_device.cpp @@ -2,7 +2,7 @@ * audio_device.cpp - base-class for audio-devices used by LMMS-mixer * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_file_device.cpp b/src/audio/audio_file_device.cpp index f13f050684..b84aae4b87 100644 --- a/src/audio/audio_file_device.cpp +++ b/src/audio/audio_file_device.cpp @@ -3,7 +3,7 @@ * their output into a file * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_file_ogg.cpp b/src/audio/audio_file_ogg.cpp index 27d4177f85..89aed357df 100644 --- a/src/audio/audio_file_ogg.cpp +++ b/src/audio/audio_file_ogg.cpp @@ -6,7 +6,7 @@ * see below. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_file_wave.cpp b/src/audio/audio_file_wave.cpp index 2da1a90b34..280c1b28bc 100644 --- a/src/audio/audio_file_wave.cpp +++ b/src/audio/audio_file_wave.cpp @@ -3,7 +3,7 @@ * into a WAVE-file. This is used for song-export. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_jack.cpp b/src/audio/audio_jack.cpp index 59706fcc46..7212103635 100644 --- a/src/audio/audio_jack.cpp +++ b/src/audio/audio_jack.cpp @@ -2,7 +2,7 @@ * audio_jack.cpp - support for JACK-transport * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_oss.cpp b/src/audio/audio_oss.cpp index 9e7ba5de0c..7723085a13 100644 --- a/src/audio/audio_oss.cpp +++ b/src/audio/audio_oss.cpp @@ -2,7 +2,7 @@ * audio_oss.cpp - device-class that implements OSS-PCM-output * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_sample_recorder.cpp b/src/audio/audio_sample_recorder.cpp index e617592f3a..352f8d25da 100644 --- a/src/audio/audio_sample_recorder.cpp +++ b/src/audio/audio_sample_recorder.cpp @@ -4,7 +4,7 @@ * also harddisk * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/audio/audio_sdl.cpp b/src/audio/audio_sdl.cpp index 15b8481c66..1fcb9a1f26 100644 --- a/src/audio/audio_sdl.cpp +++ b/src/audio/audio_sdl.cpp @@ -2,7 +2,7 @@ * audio_sdl.cpp - device-class that performs PCM-output via SDL * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/about_dialog.cpp b/src/core/about_dialog.cpp index 4b10de6a98..6482de8f52 100644 --- a/src/core/about_dialog.cpp +++ b/src/core/about_dialog.cpp @@ -2,7 +2,7 @@ * about_dialog.cpp - implementation of about-dialog * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/arp_and_chords_tab_widget.cpp b/src/core/arp_and_chords_tab_widget.cpp index 1483d9b778..8e2bb8b5af 100644 --- a/src/core/arp_and_chords_tab_widget.cpp +++ b/src/core/arp_and_chords_tab_widget.cpp @@ -3,7 +3,7 @@ * channel-window * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/bb_editor.cpp b/src/core/bb_editor.cpp index 4d909e8345..8ae7f3a693 100644 --- a/src/core/bb_editor.cpp +++ b/src/core/bb_editor.cpp @@ -2,7 +2,7 @@ * bb_editor.cpp - basic main-window for editing of beats and basslines * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index 59a210bcc4..bdd98bc665 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -2,7 +2,7 @@ * config_mgr.cpp - implementation of class configManager * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/envelope_and_lfo_widget.cpp b/src/core/envelope_and_lfo_widget.cpp index edb66b5aaa..4e0b97bf88 100644 --- a/src/core/envelope_and_lfo_widget.cpp +++ b/src/core/envelope_and_lfo_widget.cpp @@ -3,7 +3,7 @@ * channel-window * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/envelope_tab_widget.cpp b/src/core/envelope_tab_widget.cpp index 543e569085..c8399a19ab 100644 --- a/src/core/envelope_tab_widget.cpp +++ b/src/core/envelope_tab_widget.cpp @@ -3,7 +3,7 @@ * channel-window * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/export_project_dialog.cpp b/src/core/export_project_dialog.cpp index 6d4dc90cd2..3f49936668 100644 --- a/src/core/export_project_dialog.cpp +++ b/src/core/export_project_dialog.cpp @@ -2,7 +2,7 @@ * export_project_dialog.cpp - implementation of dialog for exporting project * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/file_browser.cpp b/src/core/file_browser.cpp index 882b902ca3..eefb3d4c03 100644 --- a/src/core/file_browser.cpp +++ b/src/core/file_browser.cpp @@ -2,7 +2,7 @@ * file_browser.cpp - implementation of the project-, preset- and sample-file-browser * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/instrument.cpp b/src/core/instrument.cpp index 3b6e0f332d..8b19aa2446 100644 --- a/src/core/instrument.cpp +++ b/src/core/instrument.cpp @@ -2,7 +2,7 @@ * instrument.cpp - base-class for all instrument-plugins (synths, samplers etc) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/main.cpp b/src/core/main.cpp index f663804424..799079992d 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -2,7 +2,7 @@ * main.cpp - just main.cpp which is starting up app... * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/midi_tab_widget.cpp b/src/core/midi_tab_widget.cpp index 51dfb40659..160ef916fa 100644 --- a/src/core/midi_tab_widget.cpp +++ b/src/core/midi_tab_widget.cpp @@ -3,7 +3,7 @@ * MIDI-related stuff * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index 9d71bde1da..8fc8a0760f 100644 --- a/src/core/mixer.cpp +++ b/src/core/mixer.cpp @@ -2,7 +2,7 @@ * mixer.cpp - audio-device-independent mixer for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -43,6 +43,7 @@ // platform-specific midi-interface-classes #include "midi_alsa_raw.h" +#include "midi_alsa_seq.h" #include "midi_oss.h" #include "midi_dummy.h" @@ -141,6 +142,7 @@ mixer::mixer() : mixer::~mixer() { delete m_audioDev; + delete m_midiClient; bufferAllocator::free( m_buffer1 ); bufferAllocator::free( m_buffer2 ); @@ -645,15 +647,26 @@ midiClient * mixer::tryMIDIClients( void ) "midiclient" ); #ifdef ALSA_SUPPORT + if( client_name == midiALSASeq::name() || client_name == "" ) + { + midiALSASeq * malsas = new midiALSASeq(); + if( malsas->isRunning() ) + { + m_midiClientName = midiALSASeq::name(); + return( malsas ); + } + delete malsas; + } + if( client_name == midiALSARaw::name() || client_name == "" ) { - midiALSARaw * malsa = new midiALSARaw(); - if( malsa->isRunning() ) + midiALSARaw * malsar = new midiALSARaw(); + if( malsar->isRunning() ) { m_midiClientName = midiALSARaw::name(); - return( malsa ); + return( malsar ); } - delete malsa; + delete malsar; } #endif diff --git a/src/core/name_label.cpp b/src/core/name_label.cpp index 2934df78a1..49a947c163 100644 --- a/src/core/name_label.cpp +++ b/src/core/name_label.cpp @@ -3,7 +3,7 @@ * is renamable by double-clicking it * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/note.cpp b/src/core/note.cpp index b04d106929..d9ccab3bb6 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -2,7 +2,7 @@ * note.cpp - implementation of class note * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/note_play_handle.cpp b/src/core/note_play_handle.cpp index 4387bfe1f2..e4195ba96c 100644 --- a/src/core/note_play_handle.cpp +++ b/src/core/note_play_handle.cpp @@ -3,7 +3,7 @@ * play-engine * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp index 9c02fa0904..4e04a7893c 100644 --- a/src/core/piano_roll.cpp +++ b/src/core/piano_roll.cpp @@ -3,7 +3,7 @@ * writing of melodies * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/piano_widget.cpp b/src/core/piano_widget.cpp index 7069eb3dd1..c5826fd098 100644 --- a/src/core/piano_widget.cpp +++ b/src/core/piano_widget.cpp @@ -3,7 +3,7 @@ * for testing channel * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp index cfc1b2d4ce..b1918612d0 100644 --- a/src/core/plugin.cpp +++ b/src/core/plugin.cpp @@ -2,7 +2,7 @@ * plugin.cpp - implemenation of plugin-class including plugin-loader * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/plugin_browser.cpp b/src/core/plugin_browser.cpp index 58b98f01be..1dea45b21b 100644 --- a/src/core/plugin_browser.cpp +++ b/src/core/plugin_browser.cpp @@ -2,7 +2,7 @@ * plugin_browser.cpp - implementation of the plugin-browser * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/preset_preview_play_handle.cpp b/src/core/preset_preview_play_handle.cpp index 0829aa7e95..b55c779268 100644 --- a/src/core/preset_preview_play_handle.cpp +++ b/src/core/preset_preview_play_handle.cpp @@ -3,7 +3,7 @@ * presetPreviewPlayHandle * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/sample_play_handle.cpp b/src/core/sample_play_handle.cpp index 9041673f18..2822849d8e 100644 --- a/src/core/sample_play_handle.cpp +++ b/src/core/sample_play_handle.cpp @@ -2,7 +2,7 @@ * sample_play_handle.cpp - implementation of class samplePlayHandle * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/setup_dialog.cpp b/src/core/setup_dialog.cpp index a6c8a75fca..ff6219204b 100644 --- a/src/core/setup_dialog.cpp +++ b/src/core/setup_dialog.cpp @@ -2,7 +2,7 @@ * setup_dialog.cpp - dialog for setting up LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -67,6 +67,7 @@ // platform-specific midi-interface-classes #include "midi_alsa_raw.h" +#include "midi_alsa_seq.h" #include "midi_oss.h" #include "midi_dummy.h" @@ -314,6 +315,8 @@ setupDialog::setupDialog( configTabs _tab_to_open ) : //msw_layout->setAutoAdd( TRUE ); #ifdef ALSA_SUPPORT + m_midiIfaceSetupWidgets[midiALSASeq::name()] = + new midiALSASeq::setupWidget( msw ); m_midiIfaceSetupWidgets[midiALSARaw::name()] = new midiALSARaw::setupWidget( msw ); #endif diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp index 1ae07ff245..b737bd8161 100644 --- a/src/core/song_editor.cpp +++ b/src/core/song_editor.cpp @@ -2,7 +2,7 @@ * song_editor.cpp - basic window for editing song * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp index 03f6e163c8..9dd0ede087 100644 --- a/src/core/surround_area.cpp +++ b/src/core/surround_area.cpp @@ -3,7 +3,7 @@ * calculation of volume for each speaker * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 29fb960a53..2bce7bc1c5 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -3,7 +3,7 @@ * position marker * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/track.cpp b/src/core/track.cpp index ebbc48e521..29776f9cce 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -3,7 +3,7 @@ * all track-like objects (beat/bassline, sample-track...) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp index 700614e1dc..80f0907d47 100644 --- a/src/core/track_container.cpp +++ b/src/core/track_container.cpp @@ -3,7 +3,7 @@ * like Song-Editor, BB-Editor... * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/buffer_allocator.cpp b/src/lib/buffer_allocator.cpp index 6e5cde08de..367cec8b26 100644 --- a/src/lib/buffer_allocator.cpp +++ b/src/lib/buffer_allocator.cpp @@ -3,7 +3,7 @@ * optimized memory-management for audio-buffers * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/clipboard.cpp b/src/lib/clipboard.cpp index 91e876cee0..20f74a498b 100644 --- a/src/lib/clipboard.cpp +++ b/src/lib/clipboard.cpp @@ -2,7 +2,7 @@ * clipboard.cpp - the clipboard for patterns, notes etc. * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/embed.cpp b/src/lib/embed.cpp index ae2d5c3362..5edb2bdd11 100644 --- a/src/lib/embed.cpp +++ b/src/lib/embed.cpp @@ -2,7 +2,7 @@ * embed.cpp - misc stuff for using embedded resources (linked into binary) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/mmp.cpp b/src/lib/mmp.cpp index 64a49b2004..970554267c 100644 --- a/src/lib/mmp.cpp +++ b/src/lib/mmp.cpp @@ -2,7 +2,7 @@ * mmp.cpp - implementation of class multimediaProject * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/oscillator.cpp b/src/lib/oscillator.cpp index ca6f0fe33e..326947bc6b 100644 --- a/src/lib/oscillator.cpp +++ b/src/lib/oscillator.cpp @@ -2,7 +2,7 @@ * oscillator.cpp - implementation of powerful oscillator-class * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/sample_buffer.cpp b/src/lib/sample_buffer.cpp index a9ed579ef0..444d7ae874 100644 --- a/src/lib/sample_buffer.cpp +++ b/src/lib/sample_buffer.cpp @@ -2,7 +2,7 @@ * sample_buffer.cpp - container-class sampleBuffer * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/lib/string_pair_drag.cpp b/src/lib/string_pair_drag.cpp index aecc8d2922..d56a1b9c8c 100644 --- a/src/lib/string_pair_drag.cpp +++ b/src/lib/string_pair_drag.cpp @@ -3,7 +3,7 @@ * for drag'n'drop of string-pairs * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/midi/midi_alsa_raw.cpp b/src/midi/midi_alsa_raw.cpp index c24ee29825..6848c70c8b 100644 --- a/src/midi/midi_alsa_raw.cpp +++ b/src/midi/midi_alsa_raw.cpp @@ -2,7 +2,7 @@ * midi_alsa_raw.cpp - midi-client for RawMIDI via ALSA * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -102,7 +102,7 @@ midiALSARaw::~midiALSARaw() QString midiALSARaw::probeDevice( void ) { - QString dev = configManager::inst()->value( "midialsa", "device" ); + QString dev = configManager::inst()->value( "midialsaraw", "device" ); if( dev == "" ) { if( getenv( "MIDIDEV" ) != NULL ) @@ -221,7 +221,7 @@ midiALSARaw::setupWidget::~setupWidget() void midiALSARaw::setupWidget::saveSettings( void ) { - configManager::inst()->setValue( "midialsa", "device", + configManager::inst()->setValue( "midialsaraw", "device", m_device->text() ); } diff --git a/src/midi/midi_client.cpp b/src/midi/midi_client.cpp index d4b8bde104..9b92e18f39 100644 --- a/src/midi/midi_client.cpp +++ b/src/midi/midi_client.cpp @@ -2,7 +2,7 @@ * midi_client.cpp - base-class for MIDI-clients like ALSA-sequencer-client * * Linux MultiMedia Studio - * Copyright (_c) 2004-2005 Tobias Doerffel + * Copyright (_c) 2004-2005 Tobias Doerffel * This file partly contains code from Fluidsynth, Peter Hanappe * * This program is free software; you can redistribute it and/or @@ -32,11 +32,12 @@ /*#include "midi_mapper.h"*/ #include "templates.h" #include "midi_port.h" +#include "note.h" - -#include "midi_alsa_raw.h" +/*#include "midi_alsa_raw.h" +#include "midi_alsa_seq.h" #include "midi_oss.h" -#include "midi_dummy.h" +#include "midi_dummy.h"*/ @@ -49,7 +50,31 @@ midiClient::midiClient( void ) midiClient::~midiClient() { - //TODO: noteOffAll(); + //TODO: noteOffAll(); / clear all ports +} + + + + +void midiClient::applyPortMode( midiPort * ) +{ +} + + + + +void midiClient::applyPortName( midiPort * ) +{ +} + + + +midiPort * midiClient::addPort( midiEventProcessor * _mep, + const QString & _name ) +{ + midiPort * port = new midiPort( this, _mep, _name ); + m_midiPorts.push_back( port ); + return( port ); } @@ -72,7 +97,6 @@ void midiClient::removePort( midiPort * _port ) - midiRawClient::midiRawClient() : midiClient() { @@ -88,26 +112,6 @@ midiRawClient::~midiRawClient() -midiPort * FASTCALL midiRawClient::createPort( midiEventProcessor * _mep, - const QString & _desired_name ) -{ - midiPort * mp = new midiPort( this, _mep, _desired_name ); - addPort( mp ); - return( mp ); -} - - - - -// raw-MIDI-clients to not have real ports, therefore the name doesn't matter -// and we can dummy-implement validation-method -void midiRawClient::validatePortName( midiPort * ) -{ -} - - - - void midiRawClient::parseData( const Uint8 _c ) { /*********************************************************************/ @@ -264,6 +268,7 @@ void midiRawClient::processOutEvent( const midiEvent & _me, { case NOTE_ON: case NOTE_OFF: + case KEY_PRESSURE: if( _port->outputChannel() >= 0 ) { sendByte( _me.m_type | _port->outputChannel() ); @@ -287,6 +292,8 @@ void midiRawClient::processOutEvent( const midiEvent & _me, break; default: + printf( "midiRawClient: unhandled MIDI-event %d\n", + (int) _me.m_type ); break; } } @@ -327,7 +334,7 @@ Uint8 midiRawClient::eventLength( const Uint8 _event ) { if ( _event < 0xF0 ) { - return( REMAINS_80E0[( ( _event - 0x80 ) >>4 ) & 0x0F] ); + return( REMAINS_80E0[( ( _event - 0x80 ) >> 4 ) & 0x0F] ); } else if ( _event < 0xF7 ) { diff --git a/src/midi/midi_mapper.cpp b/src/midi/midi_mapper.cpp index a4f71773e4..88c306315e 100644 --- a/src/midi/midi_mapper.cpp +++ b/src/midi/midi_mapper.cpp @@ -2,7 +2,7 @@ * midi_mapper.cpp - MIDI-mapper for any midiDevice * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/midi/midi_oss.cpp b/src/midi/midi_oss.cpp index db13794784..b548c16f0d 100644 --- a/src/midi/midi_oss.cpp +++ b/src/midi/midi_oss.cpp @@ -2,7 +2,7 @@ * midi_oss.cpp - OSS-raw-midi-client * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/midi/midi_port.cpp b/src/midi/midi_port.cpp index 32f478b9a4..cb5add3fdc 100644 --- a/src/midi/midi_port.cpp +++ b/src/midi/midi_port.cpp @@ -3,7 +3,7 @@ * sequencing system * * Linux MultiMedia Studio - * Copyright (_c) 2004-2005 Tobias Doerffel + * Copyright (_c) 2004-2005 Tobias Doerffel * This file partly contains code from Fluidsynth, Peter Hanappe * * This program is free software; you can redistribute it and/or @@ -50,10 +50,19 @@ midiPort::~midiPort() -void midiPort::trySetName( const QString & _name ) +void midiPort::setName( const QString & _name ) { - setName( _name ); - m_midiClient->validatePortName( this ); + m_name = _name; + m_midiClient->applyPortName( this ); +} + + + + +void midiPort::setMode( modes _mode ) +{ + m_mode = _mode; + m_midiClient->applyPortMode( this ); } diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index ed6392f857..86988b22c9 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -2,7 +2,7 @@ * bb_track.cpp - implementation of class bbTrack * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index f2fbe353c1..e2be5d4719 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -2,7 +2,7 @@ * pattern.cpp - implementation of class pattern which holds notes * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp index 54eaa68624..be3c860ff4 100644 --- a/src/tracks/sample_track.cpp +++ b/src/tracks/sample_track.cpp @@ -3,7 +3,7 @@ * provides arrangement of samples * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/group_box.cpp b/src/widgets/group_box.cpp index 0dbffb5b08..cc72722aa0 100644 --- a/src/widgets/group_box.cpp +++ b/src/widgets/group_box.cpp @@ -2,7 +2,7 @@ * group_box.cpp - groupbox for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/knob.cpp b/src/widgets/knob.cpp index 61fa50de7d..e36364487e 100644 --- a/src/widgets/knob.cpp +++ b/src/widgets/knob.cpp @@ -5,7 +5,7 @@ * Josef Wilgen * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/lcd_spinbox.cpp b/src/widgets/lcd_spinbox.cpp index c897705e57..bdb85852d7 100644 --- a/src/widgets/lcd_spinbox.cpp +++ b/src/widgets/lcd_spinbox.cpp @@ -2,7 +2,7 @@ * lcd_spinbox.cpp - class lcdSpinBox, an improved QLCDNumber * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/led_checkbox.cpp b/src/widgets/led_checkbox.cpp index 47a32228ce..e234676f8c 100644 --- a/src/widgets/led_checkbox.cpp +++ b/src/widgets/led_checkbox.cpp @@ -2,7 +2,7 @@ * led_checkbox.cpp - class ledCheckBox, an improved QCheckBox * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/nstate_button.cpp b/src/widgets/nstate_button.cpp index b16ff1dd26..c672a8531c 100644 --- a/src/widgets/nstate_button.cpp +++ b/src/widgets/nstate_button.cpp @@ -2,7 +2,7 @@ * nstate_button.cpp - implementation of n-state-button * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/pixmap_button.cpp b/src/widgets/pixmap_button.cpp index 11c6046079..74eab33fe1 100644 --- a/src/widgets/pixmap_button.cpp +++ b/src/widgets/pixmap_button.cpp @@ -3,7 +3,7 @@ * checkboxes/radiobuttons etc) * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/project_notes.cpp b/src/widgets/project_notes.cpp index 805104d814..70c839e55c 100644 --- a/src/widgets/project_notes.cpp +++ b/src/widgets/project_notes.cpp @@ -2,7 +2,7 @@ * project_notes.cpp - implementation of project-notes-editor * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/rename_dialog.cpp b/src/widgets/rename_dialog.cpp index fb958ccc24..440fb403a8 100644 --- a/src/widgets/rename_dialog.cpp +++ b/src/widgets/rename_dialog.cpp @@ -2,7 +2,7 @@ * rename_dialog.cpp - implementation of dialog for renaming something * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/side_bar_widget.cpp b/src/widgets/side_bar_widget.cpp index 862a8c45a6..b27489b2c0 100644 --- a/src/widgets/side_bar_widget.cpp +++ b/src/widgets/side_bar_widget.cpp @@ -2,7 +2,7 @@ * side_bar_widget.cpp - implementation of base-widget for side-bar * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/tab_bar.cpp b/src/widgets/tab_bar.cpp index 319e772b09..0346dfd95e 100644 --- a/src/widgets/tab_bar.cpp +++ b/src/widgets/tab_bar.cpp @@ -2,7 +2,7 @@ * tab_bar.cpp - implementation of tab-bar * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/tab_widget.cpp b/src/widgets/tab_widget.cpp index 4fb871835b..d2cedf0411 100644 --- a/src/widgets/tab_widget.cpp +++ b/src/widgets/tab_widget.cpp @@ -2,7 +2,7 @@ * tabwidget.cpp - tabwidget for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/text_float.cpp b/src/widgets/text_float.cpp index 923167f529..2f934be499 100644 --- a/src/widgets/text_float.cpp +++ b/src/widgets/text_float.cpp @@ -2,7 +2,7 @@ * text_float.cpp - class textFloat, a floating text-label * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/tooltip.cpp b/src/widgets/tooltip.cpp index 517b48c17b..9f7030e95e 100644 --- a/src/widgets/tooltip.cpp +++ b/src/widgets/tooltip.cpp @@ -2,7 +2,7 @@ * tooltip.cpp - namespace toolTip, a tooltip-wrapper for LMMS * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public diff --git a/src/widgets/visualization_widget.cpp b/src/widgets/visualization_widget.cpp index a3e1ad9d4c..23b04976aa 100644 --- a/src/widgets/visualization_widget.cpp +++ b/src/widgets/visualization_widget.cpp @@ -2,7 +2,7 @@ * visualization_widget.cpp - widget for visualization of waves * * Linux MultiMedia Studio - * Copyright (c) 2004-2005 Tobias Doerffel + * Copyright (c) 2004-2005 Tobias Doerffel * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public