From 42b1bc7e45377e379fb1472f0c0affbb5ac5770c Mon Sep 17 00:00:00 2001 From: Rainer Blickle Date: Fri, 13 Aug 2010 21:30:40 +0200 Subject: Fix last compile errors --- .cproject | 576 ++++++++++++++++++++++++++++++++++++++ .dependencies | 207 ++++++++++++++ .externalToolBuilders/make.launch | 9 + .project | 88 ++++++ menuitems.c | 2 +- menuitems.h | 1 + sndctl.c | 2 +- 7 files changed, 883 insertions(+), 2 deletions(-) create mode 100644 .cproject create mode 100644 .dependencies create mode 100644 .externalToolBuilders/make.launch create mode 100644 .project diff --git a/.cproject b/.cproject new file mode 100644 index 0000000..5eebbc5 --- /dev/null +++ b/.cproject @@ -0,0 +1,576 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.dependencies b/.dependencies new file mode 100644 index 0000000..43cfae3 --- /dev/null +++ b/.dependencies @@ -0,0 +1,207 @@ +sndctl.o: sndctl.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h sndctl.h setup.h soundman.h alsa.h \ + mixer.h soundset.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h mainmenu.h \ + setupmenu.h +alsa.o: alsa.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h alsa.h mixer.h +i18n.o: i18n.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h +mainmenu.o: mainmenu.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h mainmenu.h soundset.h sndctl.h \ + setup.h soundman.h alsa.h mixer.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h soundsetmenu.h \ + menuitems.h +menuitems.o: menuitems.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h menuitems.h mixer.h soundman.h \ + alsa.h sndctl.h setup.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h soundset.h +mixer.o: mixer.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h mixer.h soundset.h sndctl.h \ + setup.h soundman.h alsa.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h +setup.o: setup.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h setup.h sndctl.h soundman.h alsa.h \ + mixer.h soundset.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h +setupmenu.o: setupmenu.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h setupmenu.h menuitems.h mixer.h \ + sndctl.h setup.h soundman.h alsa.h soundset.h status.h \ + ../../../include/vdr/status.h ../../../include/vdr/device.h \ + ../../../include/vdr/ci.h ../../../include/vdr/dvbsubtitle.h \ + ../../../include/vdr/eit.h ../../../include/vdr/filter.h \ + ../../../include/vdr/nit.h ../../../include/vdr/pat.h \ + ../../../include/vdr/ringbuffer.h ../../../include/vdr/sdt.h \ + ../../../include/vdr/sections.h ../../../include/vdr/spu.h \ + ../../../include/vdr/player.h +soundman.o: soundman.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h soundman.h alsa.h mixer.h sndctl.h \ + setup.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h soundset.h +soundset.o: soundset.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h soundset.h sndctl.h setup.h \ + soundman.h alsa.h mixer.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h +soundsetmenu.o: soundsetmenu.c defaults.h \ + ../../../include/vdr/interface.h ../../../include/vdr/config.h \ + ../../../include/vdr/i18n.h ../../../include/vdr/tools.h \ + ../../../include/vdr/font.h ../../../include/vdr/remote.h \ + ../../../include/vdr/keys.h ../../../include/vdr/thread.h \ + ../../../include/vdr/skins.h ../../../include/vdr/channels.h \ + ../../../include/vdr/sources.h ../../../include/vdr/epg.h \ + ../../../include/vdr/osd.h ../../../include/vdr/recording.h \ + ../../../include/vdr/timers.h ../../../include/vdr/themes.h \ + ../../../include/vdr/svdrp.h ../../../include/vdr/plugin.h \ + ../../../include/vdr/menuitems.h ../../../include/vdr/osdbase.h i18n.h \ + soundsetmenu.h menuitems.h mixer.h soundset.h sndctl.h setup.h \ + soundman.h alsa.h status.h ../../../include/vdr/status.h \ + ../../../include/vdr/device.h ../../../include/vdr/ci.h \ + ../../../include/vdr/dvbsubtitle.h ../../../include/vdr/eit.h \ + ../../../include/vdr/filter.h ../../../include/vdr/nit.h \ + ../../../include/vdr/pat.h ../../../include/vdr/ringbuffer.h \ + ../../../include/vdr/sdt.h ../../../include/vdr/sections.h \ + ../../../include/vdr/spu.h ../../../include/vdr/player.h +status.o: status.c defaults.h ../../../include/vdr/interface.h \ + ../../../include/vdr/config.h ../../../include/vdr/i18n.h \ + ../../../include/vdr/tools.h ../../../include/vdr/font.h \ + ../../../include/vdr/remote.h ../../../include/vdr/keys.h \ + ../../../include/vdr/thread.h ../../../include/vdr/skins.h \ + ../../../include/vdr/channels.h ../../../include/vdr/sources.h \ + ../../../include/vdr/epg.h ../../../include/vdr/osd.h \ + ../../../include/vdr/recording.h ../../../include/vdr/timers.h \ + ../../../include/vdr/themes.h ../../../include/vdr/svdrp.h \ + ../../../include/vdr/plugin.h ../../../include/vdr/menuitems.h \ + ../../../include/vdr/osdbase.h i18n.h status.h \ + ../../../include/vdr/status.h ../../../include/vdr/device.h \ + ../../../include/vdr/ci.h ../../../include/vdr/dvbsubtitle.h \ + ../../../include/vdr/eit.h ../../../include/vdr/filter.h \ + ../../../include/vdr/nit.h ../../../include/vdr/pat.h \ + ../../../include/vdr/ringbuffer.h ../../../include/vdr/sdt.h \ + ../../../include/vdr/sections.h ../../../include/vdr/spu.h \ + ../../../include/vdr/player.h soundman.h alsa.h mixer.h sndctl.h setup.h \ + soundset.h diff --git a/.externalToolBuilders/make.launch b/.externalToolBuilders/make.launch new file mode 100644 index 0000000..55b5c0c --- /dev/null +++ b/.externalToolBuilders/make.launch @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..5044a9f --- /dev/null +++ b/.project @@ -0,0 +1,88 @@ + + + sndctl + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + all + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + make + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + false + + + org.eclipse.cdt.make.core.enableCleanBuild + true + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + all + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + true + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/make.launch + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/menuitems.c b/menuitems.c index 13eb8c3..5a5cc52 100644 --- a/menuitems.c +++ b/menuitems.c @@ -126,7 +126,7 @@ static char* copyMixerControl(string controlString) { * constructor */ cSoundSetControlItem::cSoundSetControlItem( cSoundSet *SoundSet, cControlId Control, bool IsActive ) -:cMenuEditStrItem( Control.getDisplayName().c_str(), copyMixerControl( SoundSet->Get( Control )), 11, "~=+-%0123456789;" ){ +:cMenuEditStrItem( Control.getDisplayName().c_str(), value=copyMixerControl( SoundSet->Get( Control )), 11, "~=+-%0123456789;" ){ // save arguments soundset = SoundSet; control = Control; diff --git a/menuitems.h b/menuitems.h index 453d402..b3689a4 100644 --- a/menuitems.h +++ b/menuitems.h @@ -62,6 +62,7 @@ class cSoundSetControlItem:public cMenuEditStrItem { cControlId control; bool isActive; cSoundSet *soundset; + char *value; public: cSoundSetControlItem( cSoundSet*, cControlId Control, bool ); diff --git a/sndctl.c b/sndctl.c index 3e7ccd0..442b592 100644 --- a/sndctl.c +++ b/sndctl.c @@ -14,7 +14,7 @@ #include "mainmenu.h" #include "setupmenu.h" -static const char *VERSION = "0.1.5"; +static const char *VERSION = "0.1.5-1"; static const char *DESCRIPTION = "ALSA mixer control"; static const char *SVDRHelpPages[] = { "SSET [ sound set name ]\n" -- cgit v1.2.3