[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde1-kdebase] /: - Adde kaudio and kplayaudio.
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2016-10-15 15:42:03
Message-ID: E1bvR63-0002lC-P1 () code ! kde ! org
[Download RAW message or body]

Git commit 444ba45c273384ddbb4257027bdd60ec09fda13e by Helio Chissini de Ca=
stro.
Committed on 15/10/2016 at 15:41.
Pushed by helio into branch 'master'.

- Adde kaudio and kplayaudio.

M  +1    -1    CMakeLists.txt
A  +16   -0    doc/kcontrol/CMakeLists.txt
A  +5    -0    doc/kcontrol/kcmbell/CMakeLists.txt
A  +12   -0    doc/kcontrol/kcmdisplay/CMakeLists.txt
A  +15   -0    doc/kcontrol/kcminfo/CMakeLists.txt
A  +6    -0    doc/kcontrol/kcminput/CMakeLists.txt
A  +5    -0    doc/kcontrol/kcmkeys/CMakeLists.txt
A  +12   -0    doc/kcontrol/kcmkfm/CMakeLists.txt
A  +7    -0    doc/kcontrol/kcmkpanel/CMakeLists.txt
A  +10   -0    doc/kcontrol/kcmkwm/CMakeLists.txt
A  +5    -0    doc/kcontrol/kcmlocale/CMakeLists.txt
A  +6    -0    doc/kcontrol/kcmsamba/CMakeLists.txt
A  +5    -0    doc/kcontrol/kcmsyssound/CMakeLists.txt
A  +8    -0    doc/kcontrol/kthememgr/CMakeLists.txt
A  +23   -0    doc/kdehelp/CMakeLists.txt
A  +9    -0    doc/kdehelp/kpanel/CMakeLists.txt
A  +10   -0    doc/kdehelp/kwm/CMakeLists.txt
A  +14   -0    doc/kdehelp/quickstart/CMakeLists.txt
A  +11   -0    doc/kdisknav/CMakeLists.txt
A  +8    -0    doc/kdm/CMakeLists.txt
A  +8    -0    doc/kfind/CMakeLists.txt
A  +28   -0    doc/kfm/CMakeLists.txt
A  +8    -0    doc/kfontmanager/CMakeLists.txt
A  +11   -0    doc/kmenuedit/CMakeLists.txt
A  +9    -0    doc/kpager/CMakeLists.txt
A  +9    -0    doc/kpanel/CMakeLists.txt
A  +3    -0    doc/kvt/CMakeLists.txt
A  +10   -0    doc/kwm/CMakeLists.txt
A  +34   -0    kaudio/CMakeLists.txt
M  +2    -2    kaudio/kplayaudio.cpp

http://commits.kde.org/kde1-kdebase/444ba45c273384ddbb4257027bdd60ec09fda13e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14285cb..9d98b55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ add_subdirectory(krootwm)
 #add_subdirectory(kdm)
 #add_subdirectory(kscreensaver)
 add_subdirectory(kmenuedit)
-#add_subdirectory(kaudio)
+add_subdirectory(kaudio)
 add_subdirectory(kcontrol)
 #add_subdirectory(kappfinder)
 add_subdirectory(pics)
diff --git a/doc/kcontrol/CMakeLists.txt b/doc/kcontrol/CMakeLists.txt
new file mode 100644
index 0000000..2a74230
--- /dev/null
+++ b/doc/kcontrol/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_subdirectory(kcmbell)
+add_subdirectory(kcmdisplay)
+add_subdirectory(kcminfo)
+add_subdirectory(kcminput)
+add_subdirectory(kcmkeys)
+add_subdirectory(kcmkfm)
+add_subdirectory(kcmkpanel)
+add_subdirectory(kcmkwm)
+add_subdirectory(kcmlocale)
+add_subdirectory(kcmsamba)
+add_subdirectory(kcmsyssound)
+add_subdirectory(kthememgr)
+
+install(FILES
+    index-1.html  index-2.html  index.html logotp3.gif
+    DESTINATION ${KDE1_HTMLDIR}/en/kcontrol )
diff --git a/doc/kcontrol/kcmbell/CMakeLists.txt b/doc/kcontrol/kcmbell/CMa=
keLists.txt
new file mode 100644
index 0000000..919ce6b
--- /dev/null
+++ b/doc/kcontrol/kcmbell/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+bell-1.html
+bell.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmbell )
diff --git a/doc/kcontrol/kcmdisplay/CMakeLists.txt b/doc/kcontrol/kcmdispl=
ay/CMakeLists.txt
new file mode 100644
index 0000000..5498f6a
--- /dev/null
+++ b/doc/kcontrol/kcmdisplay/CMakeLists.txt
@@ -0,0 +1,12 @@
+install(FILES
+kdisplay-7.html
+kdisplay-2.html
+kdisplay-8.html
+kdisplay-5.html
+kdisplay-1.html
+kdisplay-3.html
+kdisplay-4.html
+kdisplay.html
+kdisplay-6.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmdisplay )
diff --git a/doc/kcontrol/kcminfo/CMakeLists.txt b/doc/kcontrol/kcminfo/CMa=
keLists.txt
new file mode 100644
index 0000000..3fa5298
--- /dev/null
+++ b/doc/kcontrol/kcminfo/CMakeLists.txt
@@ -0,0 +1,15 @@
+install(FILES
+info-8.html
+info-2.html
+info-5.html
+info-10.html
+info-11.html
+info-3.html
+info-1.html
+info.html
+info-6.html
+info-7.html
+info-4.html
+info-9.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcminfo )
diff --git a/doc/kcontrol/kcminput/CMakeLists.txt b/doc/kcontrol/kcminput/C=
MakeLists.txt
new file mode 100644
index 0000000..1592992
--- /dev/null
+++ b/doc/kcontrol/kcminput/CMakeLists.txt
@@ -0,0 +1,6 @@
+install(FILES
+input-1.html
+input-2.html
+input.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcminput )
diff --git a/doc/kcontrol/kcmkeys/CMakeLists.txt b/doc/kcontrol/kcmkeys/CMa=
keLists.txt
new file mode 100644
index 0000000..0177f11
--- /dev/null
+++ b/doc/kcontrol/kcmkeys/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+keys-1.html
+keys.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmkeys )
diff --git a/doc/kcontrol/kcmkfm/CMakeLists.txt b/doc/kcontrol/kcmkfm/CMake=
Lists.txt
new file mode 100644
index 0000000..28445e0
--- /dev/null
+++ b/doc/kcontrol/kcmkfm/CMakeLists.txt
@@ -0,0 +1,12 @@
+install(FILES
+kfm.html
+kfm-6.html
+kfm-8.html
+kfm-2.html
+kfm-7.html
+kfm-3.html
+kfm-5.html
+kfm-4.html
+kfm-1.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmkfm )
diff --git a/doc/kcontrol/kcmkpanel/CMakeLists.txt b/doc/kcontrol/kcmkpanel=
/CMakeLists.txt
new file mode 100644
index 0000000..004f984
--- /dev/null
+++ b/doc/kcontrol/kcmkpanel/CMakeLists.txt
@@ -0,0 +1,7 @@
+install(FILES
+kpanel-3.html
+kpanel.html
+kpanel-1.html
+kpanel-2.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmkpanel )
diff --git a/doc/kcontrol/kcmkwm/CMakeLists.txt b/doc/kcontrol/kcmkwm/CMake=
Lists.txt
new file mode 100644
index 0000000..4915ec1
--- /dev/null
+++ b/doc/kcontrol/kcmkwm/CMakeLists.txt
@@ -0,0 +1,10 @@
+install(FILES
+kwm-5.html
+kwm-4.html
+kwm-1.html
+kwm-6.html
+kwm-3.html
+kwm.html
+kwm-2.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmkwm )
diff --git a/doc/kcontrol/kcmlocale/CMakeLists.txt b/doc/kcontrol/kcmlocale=
/CMakeLists.txt
new file mode 100644
index 0000000..f8fb3bb
--- /dev/null
+++ b/doc/kcontrol/kcmlocale/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+locale.html
+locale-1.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmlocale )
diff --git a/doc/kcontrol/kcmsamba/CMakeLists.txt b/doc/kcontrol/kcmsamba/C=
MakeLists.txt
new file mode 100644
index 0000000..2872d57
--- /dev/null
+++ b/doc/kcontrol/kcmsamba/CMakeLists.txt
@@ -0,0 +1,6 @@
+install(FILES
+smbstatus-1.html
+smbstatus.html
+smbstatus-2.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmsamba )
diff --git a/doc/kcontrol/kcmsyssound/CMakeLists.txt b/doc/kcontrol/kcmsyss=
ound/CMakeLists.txt
new file mode 100644
index 0000000..1ba8aeb
--- /dev/null
+++ b/doc/kcontrol/kcmsyssound/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+syssound.html
+syssound-1.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kcmsyssound )
diff --git a/doc/kcontrol/kthememgr/CMakeLists.txt b/doc/kcontrol/kthememgr=
/CMakeLists.txt
new file mode 100644
index 0000000..51e4e92
--- /dev/null
+++ b/doc/kcontrol/kthememgr/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(FILES
+kthememgr-1.html
+kthememgr-4.html
+kthememgr.html
+kthememgr-3.html
+kthememgr-2.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kcontrol/kthememgr )
diff --git a/doc/kdehelp/CMakeLists.txt b/doc/kdehelp/CMakeLists.txt
new file mode 100644
index 0000000..c9c35c1
--- /dev/null
+++ b/doc/kdehelp/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_subdirectory(kpanel)
+add_subdirectory(kwm)
+add_subdirectory(quickstart)
+
+install( FILES
+    contact.html
+    devel.html
+    index.html
+    intro.html
+    kde.html
+    kdeside.gif
+    kogo3.gif
+    ksearch.html
+    kule.gif
+    logotp3.gif
+    main.html
+    nav_bar.gif
+    single_pixel.gif
+    support.html
+    tealbar.gif
+    whatis.html
+    whatiskde.html
+DESTINATION ${KDE1_HTMLDIR}/en/kdehelp)
diff --git a/doc/kdehelp/kpanel/CMakeLists.txt b/doc/kdehelp/kpanel/CMakeLi=
sts.txt
new file mode 100644
index 0000000..b1161ad
--- /dev/null
+++ b/doc/kdehelp/kpanel/CMakeLists.txt
@@ -0,0 +1,9 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kdehelp/kpanel )
diff --git a/doc/kdehelp/kwm/CMakeLists.txt b/doc/kdehelp/kwm/CMakeLists.txt
new file mode 100644
index 0000000..e246670
--- /dev/null
+++ b/doc/kdehelp/kwm/CMakeLists.txt
@@ -0,0 +1,10 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+index-6.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kdehelp/kwm )
diff --git a/doc/kdehelp/quickstart/CMakeLists.txt b/doc/kdehelp/quickstart=
/CMakeLists.txt
new file mode 100644
index 0000000..303ae87
--- /dev/null
+++ b/doc/kdehelp/quickstart/CMakeLists.txt
@@ -0,0 +1,14 @@
+install(FILES
+index-3.html
+index-10.html
+index-2.html
+index-8.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+index-9.html
+index-6.html
+index-7.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kdehelp/quickstart )
diff --git a/doc/kdisknav/CMakeLists.txt b/doc/kdisknav/CMakeLists.txt
new file mode 100644
index 0000000..536e19a
--- /dev/null
+++ b/doc/kdisknav/CMakeLists.txt
@@ -0,0 +1,11 @@
+install(FILES
+kdisknav-4.html
+kdisknav-2.html
+kdisknav-7.html
+kdisknav-6.html
+kdisknav-5.html
+kdisknav-3.html
+kdisknav.html
+kdisknav-1.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kdisknav )
diff --git a/doc/kdm/CMakeLists.txt b/doc/kdm/CMakeLists.txt
new file mode 100644
index 0000000..535242d
--- /dev/null
+++ b/doc/kdm/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kdm )
diff --git a/doc/kfind/CMakeLists.txt b/doc/kfind/CMakeLists.txt
new file mode 100644
index 0000000..a00d76c
--- /dev/null
+++ b/doc/kfind/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kfind )
diff --git a/doc/kfm/CMakeLists.txt b/doc/kfm/CMakeLists.txt
new file mode 100644
index 0000000..187053f
--- /dev/null
+++ b/doc/kfm/CMakeLists.txt
@@ -0,0 +1,28 @@
+install(FILES
+bookmarks.html
+index-3.html
+index-2.html
+index-1.html
+kfm_phil.html
+manual.html
+index.html
+kfm_how.html
+index-5.html
+mime2.html
+app.html
+mime.html
+index-4.html
+app2.html
+keyboard.html
+index-6.html
+index-7.html
+app2.gif
+app3.gif
+mime3.gif
+app1.gif
+mime2.gif
+app4.gif
+mime1.gif
+logotp3.gif
+templates.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kfm )
diff --git a/doc/kfontmanager/CMakeLists.txt b/doc/kfontmanager/CMakeLists.=
txt
new file mode 100644
index 0000000..db1fffb
--- /dev/null
+++ b/doc/kfontmanager/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kfontmanager )
diff --git a/doc/kmenuedit/CMakeLists.txt b/doc/kmenuedit/CMakeLists.txt
new file mode 100644
index 0000000..4cd7ba0
--- /dev/null
+++ b/doc/kmenuedit/CMakeLists.txt
@@ -0,0 +1,11 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+kmenuedit2.gif
+kmenuedit1.gif
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kmenuedit )
diff --git a/doc/kpager/CMakeLists.txt b/doc/kpager/CMakeLists.txt
new file mode 100644
index 0000000..16df2cf
--- /dev/null
+++ b/doc/kpager/CMakeLists.txt
@@ -0,0 +1,9 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kpager )
diff --git a/doc/kpanel/CMakeLists.txt b/doc/kpanel/CMakeLists.txt
new file mode 100644
index 0000000..0285b72
--- /dev/null
+++ b/doc/kpanel/CMakeLists.txt
@@ -0,0 +1,9 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kpanel )
diff --git a/doc/kvt/CMakeLists.txt b/doc/kvt/CMakeLists.txt
new file mode 100644
index 0000000..792f1bc
--- /dev/null
+++ b/doc/kvt/CMakeLists.txt
@@ -0,0 +1,3 @@
+install(FILES
+index.html
+  DESTINATION ${KDE1_HTMLDIR}/en/kvt )
diff --git a/doc/kwm/CMakeLists.txt b/doc/kwm/CMakeLists.txt
new file mode 100644
index 0000000..c9a0ae0
--- /dev/null
+++ b/doc/kwm/CMakeLists.txt
@@ -0,0 +1,10 @@
+install(FILES
+index-3.html
+index-2.html
+index-1.html
+index.html
+index-5.html
+index-4.html
+index-6.html
+logotp3.gif
+  DESTINATION ${KDE1_HTMLDIR}/en/kwm )
diff --git a/kaudio/CMakeLists.txt b/kaudio/CMakeLists.txt
new file mode 100644
index 0000000..e45c065
--- /dev/null
+++ b/kaudio/CMakeLists.txt
@@ -0,0 +1,34 @@
+include_directories(
+    ${QT_INCLUDE_DIR}
+    ${KDE1_INCLUDE_DIR}
+    )
+
+set(KAUDIO_SRCS kaudioserver.cpp)
+set(MAUDIO_SRCS io_oss.cpp maudio.cpp sample.cpp)
+set(KAUDIO_MOC democlient.moc kplayaudio.moc)
+set(KPLAYAUDIO_SRCS kplayaudio.cpp)
+
+QT1_WRAP_MOC(MOC_FILES kplayaudio.moc)
+QT1_WRAP_MOC(DEMO_MOC_FILES democlient.moc)
+
+add_executable(kaudioserver ${KAUDIO_SRCS})
+target_link_libraries(kaudioserver
+    ${QT_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${KDE1_KDECORE}
+    ${KDE1_MEDIATOOL}
+    )
+
+add_executable(kplayaudio ${KPLAYAUDIO_SRCS} ${MOC_FILES})
+target_link_libraries(kplayaudio
+    ${QT_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${KDE1_KDECORE}
+    ${KDE1_KDEUI}
+    ${KDE1_KFILE}
+    ${KDE1_KFM}
+    ${KDE1_MEDIATOOL}
+    )
+
+install(TARGETS kaudioserver kplayaudio RUNTIME DESTINATION ${KDE1_BINDIR})
+install(FILES  maudio.html DESTINATION ${KDE1_HTMLDIR}/en/kmedia)
diff --git a/kaudio/kplayaudio.cpp b/kaudio/kplayaudio.cpp
index a157939..60e99fe 100644
--- a/kaudio/kplayaudio.cpp
+++ b/kaudio/kplayaudio.cpp
@@ -8,7 +8,7 @@
  */
 =

 #include <stdio.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <string.h>
 =

@@ -22,7 +22,7 @@ extern "C" {
 #include "kplayaudio.h"
 #include "kplayaudio.moc"
 =

-
+using namespace std;
 =

 char **global_argv;
 KApplication *globalKapp;
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic