1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
diff -Naur basket-0.5.0-orig/src/item.cpp basket-0.5.0/src/item.cpp
--- basket-0.5.0-orig/src/item.cpp 2005-03-09 17:38:27.000000000 +0000
+++ basket-0.5.0/src/item.cpp 2005-03-31 22:59:11.000000000 +0000
@@ -46,9 +46,6 @@
#include <kfiledialog.h>
#include <qfile.h>
#include <kurifilter.h>
-#include <arts/kartsdispatcher.h>
-//#include <arts/kplayobjectfactory.h>
-//#include <arts/kartsserver.h>
#include <kaction.h>
#include <kglobalsettings.h>
@@ -219,8 +216,6 @@
connect( m_check->checkBox(), SIGNAL(clicked()), this, SLOT(slotChecked()) );
connect( &m_selectTimer, SIGNAL(timeout()), this, SLOT(select()) );
- m_playObj = 0L;
- m_playServer = 0L;
m_previous = 0L;
m_next = 0L;
m_isSelected = false;
@@ -598,15 +593,6 @@
if ( Settings::singleClick() && kapp->activePopupWidget() == 0L )
m_selectTimer.start(KGlobalSettings::autoSelectDelay(), true);
}
- if (m_type == Sound) {
- KArtsDispatcher *dispatcher = new KArtsDispatcher(); // Needed for m_playObj
- dispatcher = dispatcher; // To avoid "warning: unused variable `KArtsDispatcher*dispatcher'" warning
- if (!m_playServer)
- m_playServer = new KArtsServer();
- m_playFactory = new KDE::PlayObjectFactory(m_playServer);
- m_playObj = m_playFactory->createPlayObject(fullPath(), true);
- m_playObj->play();
- }
}
void Item::leaveEvent(QEvent*)
@@ -614,12 +600,6 @@
m_selectTimer.stop();
OnClickAction::stopHoverFeedback();
- if (m_playObj) {
- m_playObj->halt();
- delete m_playObj;
- delete m_playFactory;
- m_playObj = 0L;
- }
}
void Item::mousePressEvent(QMouseEvent *event)
diff -Naur basket-0.5.0-orig/src/item.h basket-0.5.0/src/item.h
--- basket-0.5.0-orig/src/item.h 2005-01-14 01:04:37.000000000 +0000
+++ basket-0.5.0/src/item.h 2005-03-31 22:59:11.000000000 +0000
@@ -32,9 +32,6 @@
#include <qcolor.h>
#include <kurl.h>
#include <kio/jobclasses.h>
-#include <arts/kplayobject.h>
-#include <arts/kplayobjectfactory.h>
-#include <arts/kartsserver.h>
#include "onclickaction.h"
@@ -254,9 +251,6 @@
bool m_canDrag;
QPoint m_pressPos;
bool m_wasPressed;
- KArtsServer *m_playServer;
- KDE::PlayObject *m_playObj;
- KDE::PlayObjectFactory *m_playFactory;
int m_x;
int m_y;
diff -Naur basket-0.5.0-orig/src/Makefile.am basket-0.5.0/src/Makefile.am
--- basket-0.5.0-orig/src/Makefile.am 2005-03-08 12:05:12.000000000 +0000
+++ basket-0.5.0/src/Makefile.am 2005-03-31 23:02:23.000000000 +0000
@@ -22,7 +22,7 @@
# the application source, library search path, and link libraries
basket_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-basket_LDADD = -lartskde -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+basket_LDADD = -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
diff -Naur basket-0.5.0-orig/src/Makefile.in basket-0.5.0/src/Makefile.in
--- basket-0.5.0-orig/src/Makefile.in 2005-03-09 20:27:29.000000000 +0000
+++ basket-0.5.0/src/Makefile.in 2005-03-31 23:02:43.000000000 +0000
@@ -264,7 +264,7 @@
# the application source, library search path, and link libraries
basket_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-basket_LDADD = -lartskde -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+basket_LDADD = -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
|
GitWeb